Skip to content

Commit

Permalink
Merge branch 'main' into prepare-first-nx-releases
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenjohnson authored Oct 7, 2024
2 parents e3fa19e + 58a3ece commit d283f45
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_publish_image_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'wdqs@*'
- 'wdqs-frontend@*'
- 'wdqs-proxy@*'
- 'wikibase@*'
- 'wikibase@*'

permissions:
contents: write
Expand Down Expand Up @@ -54,5 +54,5 @@ jobs:
git config --global user.name 'wikibase suite github actions bot'
git config --global user.email '[email protected]'
./nx release publish -p ${{ steps.extract_tag.outputs.imageName }}
16 changes: 13 additions & 3 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
- wikibase
- All projects (images and deploy) with unreleased changes
dry_run:
description: "Only log what will be done, don't do it yet."
description: "Dry run, don't do it yet."
type: boolean
required: true
default: true
Expand All @@ -33,6 +33,10 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0
token: ${{ secrets.GH_WBS_BOT_TOKEN }}

- uses: ./.github/actions/setup-environment
with:
Expand All @@ -44,7 +48,7 @@ jobs:
username: wmdetravisbot
password: ${{ secrets.WBS_PUBLISH_TOKEN }}

- name: Git tag release
- name: Create release
run: |
set -e # abort on error
set -x # show commands
Expand All @@ -64,4 +68,10 @@ jobs:
PROJECT_ARG="-p ${{ inputs.image_name }}"
fi
./nx release $PROJECT_ARG $DRY_RUN_FLAG
./nx release $PROJECT_ARG $DRY_RUN_FLAG --skip-publish --verbose
# Temporary workaround for nx issue: https://github.com/nrwl/nx/issues/22073#
if [ $? -eq 0 ] && [ -z "$DRY_RUN_FLAG" ]; then
git push origin main --tags
fi
3 changes: 1 addition & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
"conventionalCommits": true
},
"changelog": {
"projectChangelogs": {
}
"projectChangelogs": true
}
},
"targetDefaults": {
Expand Down

0 comments on commit d283f45

Please sign in to comment.