From 33ce2bdf2c479e6a685002e3245cc0d8316f8816 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 4 May 2021 15:25:01 -0700
Subject: [PATCH] 2.0.19 (#811)

---
 bazel/revisions.bzl          | 6 ++++++
 emscripten-releases-tags.txt | 4 +++-
 emsdk.py                     | 4 ++--
 test/test_bazel.sh           | 2 +-
 test/test_bazel_mac.sh       | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bazel/revisions.bzl b/bazel/revisions.bzl
index eae75d1..56686f4 100644
--- a/bazel/revisions.bzl
+++ b/bazel/revisions.bzl
@@ -2,6 +2,12 @@
 # DO NOT MODIFY
 
 EMSCRIPTEN_TAGS = {
+   "2.0.19": struct(
+        hash = "9b9ff2dabfb4a7fbacbc004c0bead12a60f9d05c",
+        sha_linux = "bd7c2a38ac88d219a1ab5003ddbf8fdc66a6ba55bc69f99077346edf2753b4ea",
+        sha_mac = "6cc44029c9052855a55938eb6496b5659da4b1ce9cb34502b740af5993a94f93",
+        sha_win = "a1fa8b1c387b9307f9b87c43dc83c0ff1bc04b9f29fbe4f39aff2dd946ca4b70",
+    ),
    "2.0.18": struct(
         hash = "c2ac7520fad29a7937ed60ab6a95b08eb374c7ba",
         sha_linux = "e9f777de592f606b10104b2efe5179a7a8f44e3a9dffa1e3aaf73e05eb8893d7",
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 7865a83..4018c3a 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,8 @@
 {
-  "latest": "2.0.18",
+  "latest": "2.0.19",
   "releases": {
+    "2.0.19": "9b9ff2dabfb4a7fbacbc004c0bead12a60f9d05c",
+    "2.0.19-lto": "4487f6c5107e7882ae2bad6d26c34ffdceb713f0",
     "2.0.18": "c2ac7520fad29a7937ed60ab6a95b08eb374c7ba",
     "2.0.17": "f5c45e60392b82f603e3a8039c62db294fab02d2",
     "2.0.16": "80d9674f2fafa6b9346d735c42d5c52b8cc8aa8e",
diff --git a/emsdk.py b/emsdk.py
index f37c4b5..6835c8a 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2216,7 +2216,7 @@ def get_emscripten_release_version(emscripten_releases_hash):
   releases_info = load_releases_info()
   for key, value in dict(releases_info['releases']).items():
     if value == emscripten_releases_hash:
-      return key
+      return key.split('-')[0]
   return None
 
 
@@ -2246,7 +2246,7 @@ def get_release_hash(arg, releases_info):
 
 
 def version_key(ver):
-  return tuple(map(int, re.split('[._-]', ver)))
+  return tuple(map(int, re.split('[._-]', ver)[:3]))
 
 
 # A sort function that is compatible with both Python 2 and Python 3 using a
diff --git a/test/test_bazel.sh b/test/test_bazel.sh
index 6ae69f9..932f55d 100755
--- a/test/test_bazel.sh
+++ b/test/test_bazel.sh
@@ -10,7 +10,7 @@ VER=$(grep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \
         emscripten-releases-tags.txt \
       | sed --expression "s/\./\\\./g")
 # Based on the latest version number, get the commit hash for that version.
-HASH=$(grep "${VER}" emscripten-releases-tags.txt \
+HASH=$(grep "\"${VER}\"" emscripten-releases-tags.txt \
       | grep -v latest \
       | cut -f4 -d\")
 
diff --git a/test/test_bazel_mac.sh b/test/test_bazel_mac.sh
index 851ec5f..7ff41cc 100755
--- a/test/test_bazel_mac.sh
+++ b/test/test_bazel_mac.sh
@@ -10,7 +10,7 @@ VER=$(ggrep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \
         emscripten-releases-tags.txt \
       | sed "s/\./\\\./g")
 # Based on the latest version number, get the commit hash for that version.
-HASH=$(grep "${VER}" emscripten-releases-tags.txt \
+HASH=$(grep "\"${VER}\"" emscripten-releases-tags.txt \
       | grep -v latest \
       | cut -f4 -d\")