Skip to content

Commit

Permalink
Bump nix channels in release pipeline (#4964)
Browse files Browse the repository at this point in the history
### Changes

- Bump nixpkgs version to 24.11 in release pipeline
- Bump nixpkgs to unstable in release flake.nix
- Change release-candidate.sh so it can run outside buildkite

### Issues

#4965

### Notes

I do not think this is solving the issue, but I was not able to
reproduce it locally so I shot in the dark. Because it's flaky, it
succeeded also on buildkite:
https://buildkite.com/cardano-foundation/cardano-wallet-release/builds/718#0194cb3f-964e-44e9-b10b-ef4e42237734/169-311
  • Loading branch information
paolino authored Feb 3, 2025
2 parents cf000f4 + 6dd9e57 commit a9761ea
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 31 deletions.
9 changes: 4 additions & 5 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ steps:
steps:
- label: Nix Build (linux)
commands:
- nix build .
- nix build .#cardano-wallet
- nix build .#cardano-node
- nix build .#cardano-cli
agents:
system: ${linux}

Expand Down Expand Up @@ -601,8 +603,6 @@ steps:

- group: Docker
key: docker-artifacts

# if: build.env("RELEASE_CANDIDATE") != null
depends_on:
- linux-artifacts
steps:
Expand All @@ -619,7 +619,6 @@ steps:
depends_on:
- docker-artifacts
key: docker-e2e
# if: (build.env("RELEASE_CANDIDATE") != null && build.env("TEST_RC") == "FALSE") || build.tag =~ /^v20/
steps:
- label: Mainnet Boot Sync
timeout_in_minutes: 30
Expand Down Expand Up @@ -648,7 +647,7 @@ steps:
USE_LOCAL_IMAGE: true

- block: Mainnet Boot Sync via Mithril
if: build.env("RELEASE_CANDIDATE") == null
if: build.env("RELEASE_CANDIDATE") == null || build.env("TEST_RC") == "TRUE"
depends_on: []
key: mithril-mainnet-full-sync-block

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ agents:

env:
LC_ALL: "C.UTF-8"
NIX_PATH: "channel:nixos-21.11"
NIX_PATH: "channel:nixos-24.11"
STATE_DIR: "/var/lib/buildkite-agent/cache"
STATE_DIR_MACOS: "/var/lib/buildkite-agent-hal-mac/cache"
RELEASE_SCRIPTS_DIR: "./scripts/buildkite/release"
Expand Down
18 changes: 9 additions & 9 deletions scripts/buildkite/release/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions scripts/buildkite/release/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
'';

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs";
flake-utils.url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};

outputs = inputs:
Expand Down
38 changes: 24 additions & 14 deletions scripts/buildkite/release/release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ set -euox pipefail
# date from git tag
# example v2023-04-04 -> 2023-04-04
tag_date() {
echo "${1##v}"
echo "${1##v}"
}
# cabal version from git tag
# example v2023-04-04 -> 2023.4.4
tag_cabal_ver() {
tag_date "$1" | sed -e s/-0/-/g -e s/-/./g
tag_date "$1" | sed -e s/-0/-/g -e s/-/./g
}

git tag -l | xargs git tag -d
git fetch --tags

LOCAL_BRANCH_NAME=$(git branch --show-current)

BASE_COMMIT=$(git rev-parse HEAD)

git checkout "$BASE_COMMIT"
Expand All @@ -27,7 +29,7 @@ NEW_GIT_TAG=v$today

NEW_CABAL_VERSION=$(tag_cabal_ver "$NEW_GIT_TAG")

OLD_GIT_TAG=$( git tag -l "v2*-*-*" | sort | tail -n1)
OLD_GIT_TAG=$(git tag -l "v2*-*-*" | sort | tail -n1)

LAST_RELEASE_DATE=$(tag_date "$OLD_GIT_TAG")

Expand All @@ -45,11 +47,17 @@ fi

CARDANO_NODE_TAG=$(cardano-node version | head -n1 | awk '{print $2}')

if [ "$BUILDKITE_BRANCH" == "master" ]; then
if [ -n "${BUILDKITE:-}" ]; then
BRANCH="$BUILDKITE_BRANCH"
else
BRANCH="$LOCAL_BRANCH_NAME"
fi

if [ "$BRANCH" == "master" ]; then
RELEASE_CANDIDATE_BRANCH="release-candidate/$NEW_GIT_TAG"
TEST_RC="FALSE"
else
RELEASE_CANDIDATE_BRANCH="test-rc/$BUILDKITE_BRANCH"
RELEASE_CANDIDATE_BRANCH="test-rc/$BRANCH"
TEST_RC="TRUE"
fi

Expand All @@ -62,7 +70,7 @@ git checkout -b "$RELEASE_CANDIDATE_BRANCH" || true
sed -i "s|version: .*|version: $NEW_GIT_TAG|g" specifications/api/swagger.yaml
git commit -m "Update wallet version in swagger.yaml" specifications/api/swagger.yaml

git ls-files '*.cabal' | xargs sed -i "s|$OLD_CABAL_VERSION|$NEW_CABAL_VERSION|g"
git ls-files '*.cabal' | xargs sed -i "s|$OLD_CABAL_VERSION|$NEW_CABAL_VERSION|g"
git commit -am "Update cardano-wallet version in *.cabal files"

sed -i "s|NODE_TAG=.*|NODE_TAG=$CARDANO_NODE_TAG|g" README.md
Expand All @@ -83,11 +91,13 @@ git remote get-url origin

git push -f origin "$RELEASE_CANDIDATE_BRANCH"

buildkite-agent meta-data set "release-version" "$NEW_GIT_TAG"
buildkite-agent meta-data set "release-candidate-commit" "$RELEASE_COMMIT"
buildkite-agent meta-data set "release-candidate-branch" "$RELEASE_CANDIDATE_BRANCH"
buildkite-agent meta-data set "release-cabal-version" "$NEW_CABAL_VERSION"
buildkite-agent meta-data set "test-rc" "$TEST_RC"
buildkite-agent meta-data set "base-build" "$BUILDKITE_BUILD_ID"
buildkite-agent meta-data set "node-tag" "$CARDANO_NODE_TAG"
buildkite-agent meta-data set "last-release-date" "$LAST_RELEASE_DATE"
if [ -n "${BUILDKITE:-}" ]; then
buildkite-agent meta-data set "release-version" "$NEW_GIT_TAG"
buildkite-agent meta-data set "release-candidate-commit" "$RELEASE_COMMIT"
buildkite-agent meta-data set "release-candidate-branch" "$RELEASE_CANDIDATE_BRANCH"
buildkite-agent meta-data set "release-cabal-version" "$NEW_CABAL_VERSION"
buildkite-agent meta-data set "test-rc" "$TEST_RC"
buildkite-agent meta-data set "base-build" "$BUILDKITE_BUILD_ID"
buildkite-agent meta-data set "node-tag" "$CARDANO_NODE_TAG"
buildkite-agent meta-data set "last-release-date" "$LAST_RELEASE_DATE"
fi

0 comments on commit a9761ea

Please sign in to comment.