From 1e8faa8e83330b2e59bf9ac834cd28843588724a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Wed, 15 Jun 2022 18:03:14 +0200 Subject: [PATCH 1/2] CI: Fix binary naming for solc-bin --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53636d149..49f6f2085 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1529,10 +1529,10 @@ jobs: mkdir -p solc-bin/{linux-amd64,macosx-amd64,windows-amd64,bin} - mv github/solc-static-linux "solc-bin/linux-amd64/solc-linux-amd64-${full_version}" - mv github/solc-macos "solc-bin/macosx-amd64/solc-macosx-amd64-${full_version}" - mv github/solc-windows.exe "solc-bin/windows-amd64/solc-windows-amd64-${full_version}.exe" - mv github/soljson.js "solc-bin/bin/soljson-${full_version}.js" + mv github/solc-static-linux "solc-bin/linux-amd64/solc-linux-amd64-v${full_version}" + mv github/solc-macos "solc-bin/macosx-amd64/solc-macosx-amd64-v${full_version}" + mv github/solc-windows.exe "solc-bin/windows-amd64/solc-windows-amd64-v${full_version}.exe" + mv github/soljson.js "solc-bin/bin/soljson-v${full_version}.js" cd solc-bin/ tar --create --file ../solc-bin-binaries.tar * From 51e0ae514cd81255dc433a2701e20bdc6f26238d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Wed, 15 Jun 2022 18:04:47 +0200 Subject: [PATCH 2/2] ReleaseChecklist: Use the correct name for `c_release_binaries` --- ReleaseChecklist.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md index df72de4ee..6d07ae011 100644 --- a/ReleaseChecklist.md +++ b/ReleaseChecklist.md @@ -31,9 +31,9 @@ - [ ] Create the ``prerelease.txt`` file: (``echo -n > prerelease.txt``). - [ ] Run ``scripts/create_source_tarball.sh`` while being on the tag to create the source tarball. This will create the tarball in a directory called ``upload``. - [ ] Take the tarball from the upload directory (its name should be ``solidity_x.x.x.tar.gz``, otherwise ``prerelease.txt`` was missing in the step before) and upload the source tarball to the release page. - - [ ] Take the ``github-binaries.tar`` tarball from ``b_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to the release page. + - [ ] Take the ``github-binaries.tar`` tarball from ``c_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to the release page. Make sure it contains four binaries: ``solc-windows.exe``, ``solc-macos``, ``solc-static-linux`` and ``soljson.js``. - - [ ] Take the ``solc-bin-binaries.tar`` tarball from ``b_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to solc-bin. + - [ ] Take the ``solc-bin-binaries.tar`` tarball from ``c_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to solc-bin. - [ ] Run ``./update --reuse-hashes`` in ``solc-bin`` and verify that the script has updated ``list.js``, ``list.txt`` and ``list.json`` files correctly and that symlinks to the new release have been added in ``solc-bin/wasm/`` and ``solc-bin/emscripten-wasm32/``. - [ ] Create a pull request in solc-bin and merge.