Skip to content

Commit a233b79

Browse files
committed
Added handling for 5.x pipeline builds
ref https://linear.app/ghost/issue/PRO-1490/prepare-fiveghostis-for-5x-ghost-version - We want to be able to test out 5.x in staging to be sure this is working properly - This change makes sure all builds of the 5.x branch get deployed correctly
1 parent b0d3b34 commit a233b79

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/scripts/bump-version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const semver = require('semver');
1919

2020
let newVersion;
2121

22-
if (firstArg === 'canary' || firstArg === 'six') {
22+
if (firstArg === 'canary' || firstArg === 'five') {
2323
const bumpedVersion = semver.inc(current_version, 'minor');
2424
newVersion = `${bumpedVersion}-pre-g${buildString}`;
2525
} else {

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
env:
3333
IS_MAIN: ${{ github.ref == 'refs/heads/main' }}
3434
IS_DEVELOPMENT: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/5.x' || github.ref == 'refs/heads/6.x' }}
35-
IS_SIX: ${{ github.ref == 'refs/heads/6.x' }}
35+
IS_FIVE: ${{ github.ref == 'refs/heads/5.x' }}
3636
permissions:
3737
pull-requests: read
3838
steps:
@@ -201,7 +201,7 @@ jobs:
201201
base_commit: ${{ env.BASE_COMMIT }}
202202
is_main: ${{ env.IS_MAIN }}
203203
is_development: ${{ env.IS_DEVELOPMENT }}
204-
is_six: ${{ env.IS_SIX }}
204+
is_five: ${{ env.IS_FIVE }}
205205
member_is_in_org: ${{ steps.check_user_org_membership.outputs.is_member }}
206206
has_browser_tests_label: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'browser-tests') }}
207207
dependency_cache_key: ${{ env.cachekey }}
@@ -1083,7 +1083,7 @@ jobs:
10831083
&& needs.job_required_tests.result == 'success'
10841084
&& (
10851085
needs.job_setup.outputs.is_main == 'true'
1086-
|| needs.job_setup.outputs.is_six == 'true'
1086+
|| needs.job_setup.outputs.is_five == 'true'
10871087
|| (
10881088
github.event_name == 'pull_request'
10891089
&& (
@@ -1110,7 +1110,7 @@ jobs:
11101110
if [[ "${{ needs.job_setup.outputs.is_main }}" == "true" ]]; then
11111111
echo "deploy_version=canary" >> $GITHUB_ENV
11121112
else
1113-
echo "deploy_version=six" >> $GITHUB_ENV
1113+
echo "deploy_version=five" >> $GITHUB_ENV
11141114
fi
11151115
11161116
- name: Invoke build

0 commit comments

Comments
 (0)