diff --git a/.github/ISSUE_TEMPLATE/release-candidate.md b/.github/ISSUE_TEMPLATE/release-candidate.md index 7ed0ae84e..83de2c21c 100644 --- a/.github/ISSUE_TEMPLATE/release-candidate.md +++ b/.github/ISSUE_TEMPLATE/release-candidate.md @@ -63,7 +63,7 @@ Most of the template content is the same or very similar to what is in `release. - [ ] Enter the [logos-blockchain-module] repository locally. - [ ] Branch out from the latest `master` commit with a release branch named `release/X.Y.Z`. If this is not the first release candidate for this version, HARD reset the branch on top of `master` and force-push the new tip - [ ] Bump the `logos-blockchain.url` input in the `flake.nix` file: `logos-blockchain.url = "github:logos-blockchain/logos-blockchain?ref=X.Y.Z-rc.N";` -- [ ] Set the version to `0.0.999` inside the `metadata.json` file +- [ ] Set the version to `X.Y.Z-rc.N` inside the `metadata.json` file - [ ] Re-generate the `flake.lock` file using the command `nix flake lock` - [ ] Commit the changes and tag them with `X.Y.Z-rc.N` - [ ] Push the commit and the tag diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index cab4cf575..8c0987a72 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -17,8 +17,6 @@ concurrency: env: TEST_TAG_NAME: release-ci-test - # Release candidates always point at the fixed devnet version of the `blockchain_module` package. - PRERELEASE_MODULE_VERSION: 0.0.999 jobs: configure-version: @@ -132,14 +130,11 @@ jobs: fi done - # Release candidates target the devnet and always point at the fixed devnet version of the - # `blockchain_module` package, while releases target the testnet and publish the package under - # the same version as the node. + # The `blockchain_module` package is published under the same version as the node, for both + # releases and release candidates. Only the network they bootstrap against differs. if [[ "$IS_PRERELEASE" == "true" ]]; then - BLOCKCHAIN_MODULE_VERSION="$PRERELEASE_MODULE_VERSION" PEERS_FILE=.github/release/devnet-peers.txt else - BLOCKCHAIN_MODULE_VERSION="$VERSION" PEERS_FILE=.github/release/testnet-peers.txt fi # `sed`'s `r` command ignores a missing file, which would silently produce an empty peer list. @@ -148,9 +143,9 @@ jobs: exit 1 fi - echo "Setting '$MODULE_VERSION_PLACEHOLDER' to '$BLOCKCHAIN_MODULE_VERSION' and '$INITIAL_PEERS_PLACEHOLDER' to the contents of '$PEERS_FILE'." + echo "Setting '$MODULE_VERSION_PLACEHOLDER' to '$VERSION' and '$INITIAL_PEERS_PLACEHOLDER' to the contents of '$PEERS_FILE'." - sed -e "s|$MODULE_VERSION_PLACEHOLDER|$BLOCKCHAIN_MODULE_VERSION|g" \ + sed -e "s|$MODULE_VERSION_PLACEHOLDER|$VERSION|g" \ -e "/$INITIAL_PEERS_PLACEHOLDER/r $PEERS_FILE" \ -e "/$INITIAL_PEERS_PLACEHOLDER/d" \ "$TEMPLATE" > "$OUTPUT"