Skip to content

Commit

Permalink
Move windows trigger tag creation in the windows step group
Browse files Browse the repository at this point in the history
  • Loading branch information
Github Action committed Jul 4, 2024
1 parent 0308780 commit 1f9a626
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 40 deletions.
8 changes: 1 addition & 7 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ steps:
system: ${linux}

- label: Tag this release candidate
if: build.env("RELEASE_CANDIDATE") == null
if: build.env("RELEASE_CANDIDATE") != null
depends_on:
- windows-package
- windows-testing-bundle
Expand All @@ -438,9 +438,3 @@ steps:
- "./docker-build-push"
agents:
system: x86_64-linux

- label: Tag this release candidate
if: build.branch =~ /^release-candidate/
command: scripts/buildkite/main/tag-release-candidate.sh
agents:
system: ${linux}
24 changes: 0 additions & 24 deletions .buildkite/retag-rc-latest.sh

This file was deleted.

7 changes: 5 additions & 2 deletions .github/workflows/e2e-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: E2E Windows
on:
push:
tags:
- release-candidate/*
- test-rc/*
- release-candidate-tag/*

workflow_dispatch:
inputs:
branch:
Expand All @@ -15,6 +15,9 @@ on:
default: 'all'
jobs:
test:
concurrency:
group: windows-e2e-group
cancel-in-progress: false

runs-on: windows-latest

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Windows Unit Tests
on:
push:
tags:
- release-candidate/*
- test-rc/*
- release-candidate-tag/*

workflow_dispatch:
inputs:
Expand Down
14 changes: 9 additions & 5 deletions scripts/buildkite/main/tag-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@

set -euox pipefail

git config --global user.email "[email protected]"
git config --global user.name "Github Action"
git remote set-url origin "[email protected]:cardano-foundation/cardano-wallet.git"

TAG="release-candidate-tag"
date=$(git show -s --format=%ci $TAG | awk '{print $1}')
DTAG="$TAG-$date"
date=$(git show -s --format=%ci | awk '{print $1}')
DTAG="$TAG/$date"

git remote set-url origin \
"https://$GITHUB_TOKEN@github.com/cardano-foundation/cardano-wallet.git"
git tag --delete "$DTAG" || true
git push origin --delete "$DTAG" || true
git tag "$DTAG" "$BUILDKITE_COMMIT"
git push origin "$DTAG"
git push origin "$DTAG"

0 comments on commit 1f9a626

Please sign in to comment.