admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use .json extension for emscripten-releases-tags.json. NFC (#870)

Browse Source
This commit is contained in:
Sam Clegg
2021-08-25 17:21:40 -07:00
committed by GitHub
parent 793557c615
commit 6a932246db
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
emscripten-releases-tags.txt → emscripten-releases-tags.json
View File

4
emsdk.py
View File

@@ -2315,10 +2315,10 @@ def exit_with_error(msg):
def load_releases_info(): def load_releases_info():
if not hasattr(load_releases_info, 'cached_info'): if not hasattr(load_releases_info, 'cached_info'):
try: try:
text = open(sdk_path('emscripten-releases-tags.txt'), 'r').read() text = open(sdk_path('emscripten-releases-tags.json'), 'r').read()
load_releases_info.cached_info = json.loads(text) load_releases_info.cached_info = json.loads(text)
except Exception as e: except Exception as e:
print('Error parsing emscripten-releases-tags.txt!') print('Error parsing emscripten-releases-tags.json!')
exit_with_error(str(e)) exit_with_error(str(e))
return load_releases_info.cached_info return load_releases_info.cached_info

2
scripts/create_release.py
View File

@@ -44,7 +44,7 @@ def main(args):
release_info['releases'] = OrderedDict(reversed(releases)) release_info['releases'] = OrderedDict(reversed(releases))
release_info['aliases']['latest'] = new_version release_info['aliases']['latest'] = new_version
with open(os.path.join(root_dir, 'emscripten-releases-tags.txt'), 'w') as f: with open(os.path.join(root_dir, 'emscripten-releases-tags.json'), 'w') as f:
f.write(json.dumps(release_info, indent=2)) f.write(json.dumps(release_info, indent=2))
f.write('\n') f.write('\n')

12
scripts/update_bazel_workspace.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# This script will update emsdk/bazel/WORKSPACE to the latest version of # This script will update emsdk/bazel/WORKSPACE to the latest version of
# emscripten. It reads emsdk/emscripten-releases-tags.txt to get the latest # emscripten. It reads emsdk/emscripten-releases-tags.json to get the latest
# version number. Then, it downloads the prebuilts for that version and computes # version number. Then, it downloads the prebuilts for that version and computes
# the sha256sum for the archive. It then puts all this information into the # the sha256sum for the archive. It then puts all this information into the
# emsdk/bazel/WORKSPACE file. # emsdk/bazel/WORKSPACE file.
@@ -12,8 +12,8 @@ cd $(dirname $0)/..
# If the previous command succeeded. We are in the emsdk root. Check to make # If the previous command succeeded. We are in the emsdk root. Check to make
# sure the files and directories we need are present. # sure the files and directories we need are present.
if [[ $? = 0 ]]; then if [[ $? = 0 ]]; then
if [[ ! -f emscripten-releases-tags.txt ]]; then if [[ ! -f emscripten-releases-tags.json ]]; then
echo "Cannot find emscripten-releases-tags.txt." echo "Cannot find emscripten-releases-tags.json."
ERR=1 ERR=1
fi fi
@@ -38,7 +38,7 @@ URL2=/wasm-binaries.tbz2
# Get commit hash for $1 version # Get commit hash for $1 version
get_hash () { get_hash () {
echo $(grep "$1" emscripten-releases-tags.txt | grep -v latest | cut -f4 -d\") echo $(grep "$1" emscripten-releases-tags.json | grep -v latest | cut -f4 -d\")
} }
# Get sha256 for $1 os $2 hash # Get sha256 for $1 os $2 hash
@@ -62,9 +62,9 @@ append_revision () {
sed -i "5 i $(revisions_item $1)" bazel/revisions.bzl sed -i "5 i $(revisions_item $1)" bazel/revisions.bzl
} }
# Get the latest version number from emscripten-releases-tag.txt. # Get the latest version number from emscripten-releases-tag.json.
VER=$(grep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \ VER=$(grep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \
emscripten-releases-tags.txt \ emscripten-releases-tags.json \
| sed --expression "s/\./\\\./g") | sed --expression "s/\./\\\./g")
append_revision ${VER} append_revision ${VER}

2
test/test.py
View File

@@ -81,7 +81,7 @@ def hack_emsdk(marker, replacement):
# Set up # Set up
TAGS = json.loads(open('emscripten-releases-tags.txt').read()) TAGS = json.loads(open('emscripten-releases-tags.json').read())
# Tests # Tests

6
test/test_bazel.sh
View File

@@ -5,12 +5,12 @@ echo "test bazel"
set -x set -x
set -e set -e
# Get the latest version number from emscripten-releases-tag.txt. # Get the latest version number from emscripten-releases-tag.json.
VER=$(grep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \ VER=$(grep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \
emscripten-releases-tags.txt \ emscripten-releases-tags.json \
| sed --expression "s/\./\\\./g") | sed --expression "s/\./\\\./g")
# Based on the latest version number, get the commit hash for that version. # 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.json \
| grep -v latest \ | grep -v latest \
| cut -f4 -d\") | cut -f4 -d\")

6
test/test_bazel_mac.sh
View File

@@ -5,12 +5,12 @@ echo "test bazel"
set -x set -x
set -e set -e
# Get the latest version number from emscripten-releases-tag.txt. # Get the latest version number from emscripten-releases-tag.json.
VER=$(ggrep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \ VER=$(ggrep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \
emscripten-releases-tags.txt \ emscripten-releases-tags.json \
| sed "s/\./\\\./g") | sed "s/\./\\\./g")
# Based on the latest version number, get the commit hash for that version. # 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.json \
| grep -v latest \ | grep -v latest \
| cut -f4 -d\") | cut -f4 -d\")