Skip to content

Commit 8902c09

Browse files
AriPerkkioAriPerkkio
committed
wip
1 parent 05b165d commit 8902c09

File tree

4 files changed

+70
-84
lines changed

4 files changed

+70
-84
lines changed

‎.github/workflows/integration-test-cli.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ name: Integration Tests CLI
22

33
on:
44
pull_request:
5-
branches:
6-
- main
75

86
jobs:
97
cli-integration-test:
108
name: CLI Integration Tests
119
# Note: `prepare-release.yaml` sets this commit message
12-
if: ${{ contains(github.event.head_commit.message, 'release tutorialkit CLI') }}
10+
if: ${{ contains(github.event.pull_request.title, 'release tutorialkit CLI') }}
1311
runs-on: ubuntu-latest
1412
steps:
1513
- name: Checkout

‎.github/workflows/prepare-release.yaml

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ on:
99
default: '0.0.1'
1010
type: string
1111

12-
# CLI release PRs are done after other packages have been released
13-
workflow_run:
14-
workflows: [Publish release]
15-
types:
16-
- completed
17-
1812
jobs:
1913
prepare_release:
2014
name: Prepare release PR
@@ -50,43 +44,3 @@ jobs:
5044
#reviewers: SamVerschueren,d3lm,Nemikolh,AriPerkkio
5145
reviewers: AriPerkkio
5246
branch: chore/release-${{ inputs.version }}
53-
54-
prepare_release_CLI:
55-
name: Prepare release PR CLI
56-
if: ${{ github.event_name == 'workflow_run' }}
57-
runs-on: ubuntu-latest
58-
steps:
59-
- name: Checkout
60-
uses: actions/checkout@v4
61-
with:
62-
fetch-depth: 0
63-
64-
- uses: ./.github/actions/setup-and-build
65-
66-
# Sets steps.resolve-release-version.outputs.version
67-
- uses: ./.github/actions/resolve-release-version
68-
id: resolve-release-version
69-
70-
- name: Bump version
71-
run: >
72-
pnpm --recursive
73-
--filter tutorialkit
74-
exec npm version --no-git-tag-version --allow-same-version ${{ steps.resolve-release-version.outputs.version }}
75-
76-
- name: Generage changelog
77-
run: |
78-
pnpm run changelog
79-
git add ./packages/cli ./packages/template
80-
git checkout ./packages
81-
git checkout CHANGELOG.md
82-
83-
- name: Create Pull Request
84-
uses: peter-evans/create-pull-request@v6
85-
with:
86-
# Note: `publish-release.yaml` checks explicitly for this commit message
87-
commit-message: 'chore: release tutorialkit CLI, version: ${{ steps.resolve-release-version.outputs.version }}'
88-
title: 'chore: release tutorialkit CLI, version: ${{ steps.resolve-release-version.outputs.version }}'
89-
body: 'Bump tutorialkit CLI to version ${{ steps.resolve-release-version.outputs.version }} and generate changelog'
90-
#reviewers: SamVerschueren,d3lm,Nemikolh,AriPerkkio
91-
reviewers: AriPerkkio
92-
branch: chore/release-cli-${{ steps.resolve-release-version.outputs.version }}

‎.github/workflows/publish-release-cli.yaml

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎.github/workflows/publish-release.yaml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,72 @@ jobs:
4040
git config --global user.email '[email protected]'
4141
git tag v${{ steps.resolve-release-version.outputs.version }}
4242
git push origin v${{ steps.resolve-release-version.outputs.version }}
43+
44+
prepare_cli_release:
45+
name: Prepare release for CLI
46+
needs: [publish_release]
47+
runs-on: ubuntu-latest
48+
steps:
49+
- name: Checkout
50+
uses: actions/checkout@v4
51+
with:
52+
fetch-depth: 0
53+
54+
- uses: ./.github/actions/setup-and-build
55+
56+
# Sets steps.resolve-release-version.outputs.version
57+
- uses: ./.github/actions/resolve-release-version
58+
id: resolve-release-version
59+
60+
# Create release PR for CLI packages
61+
- name: Bump version
62+
run: >
63+
pnpm --recursive
64+
--filter tutorialkit
65+
exec npm version --no-git-tag-version --allow-same-version ${{ steps.resolve-release-version.outputs.version }}
66+
67+
- name: Generage changelog
68+
run: |
69+
pnpm run changelog
70+
git add ./packages/cli ./packages/template
71+
git checkout ./packages
72+
git checkout CHANGELOG.md
73+
74+
- name: Create Pull Request
75+
uses: peter-evans/create-pull-request@v6
76+
with:
77+
# Note: `publish-release.yaml` checks explicitly for this commit message
78+
commit-message: 'chore: release tutorialkit CLI, version: ${{ steps.resolve-release-version.outputs.version }}'
79+
title: 'chore: release tutorialkit CLI, version: ${{ steps.resolve-release-version.outputs.version }}'
80+
body: 'Bump tutorialkit CLI to version ${{ steps.resolve-release-version.outputs.version }} and generate changelog'
81+
#reviewers: SamVerschueren,d3lm,Nemikolh,AriPerkkio
82+
reviewers: AriPerkkio
83+
branch: chore/release-cli-${{ steps.resolve-release-version.outputs.version }}
84+
85+
publish_release_CLI:
86+
name: Publish release CLI
87+
runs-on: ubuntu-latest
88+
# Note: `prepare-release.yaml` sets this commit message
89+
if: ${{ contains(github.event.head_commit.message, 'release tutorialkit CLI') }}
90+
steps:
91+
- name: Checkout
92+
uses: actions/checkout@v4
93+
with:
94+
fetch-depth: 0
95+
96+
- uses: ./.github/actions/setup-and-build
97+
98+
- name: Update template's versions
99+
working-directory: ./packages/cli
100+
run: pnpm update-template
101+
102+
- name: Integration Tests
103+
working-directory: ./integration
104+
run: pnpm test
105+
106+
# TODO: Remove --dry-run
107+
- name: Publish to npm
108+
run: pnpm --recursive --filter tutorialkit exec pnpm publish --provenance --dry-run
109+
env:
110+
NODE_AUTH_TOKEN: fail-and-prevent-release
111+
# NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

0 commit comments

Comments
 (0)