From db405b1cd65fa14edcdee1129b38eb954b461414 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Sun, 30 Jun 2024 23:02:15 +0200 Subject: [PATCH 01/12] infra(release): prepare PR --- .github/workflows/prepare-release-pr.yml | 85 ++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 .github/workflows/prepare-release-pr.yml diff --git a/.github/workflows/prepare-release-pr.yml b/.github/workflows/prepare-release-pr.yml new file mode 100644 index 00000000000..d3a6d50934a --- /dev/null +++ b/.github/workflows/prepare-release-pr.yml @@ -0,0 +1,85 @@ +name: Prepare Release PR + +on: + workflow_dispatch: + inputs: + releaseType: + description: 'The type of release to prepare.' + required: true + type: choice + default: 'stable' + options: + - stable + - alpha + - beta + - rc + +permissions: + contents: write + pull-requests: write + +jobs: + prepare_release_pr: + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: Checkout + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + + - name: Install pnpm + uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0 + + - name: Set node version to 22 + uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + with: + node-version: 22 + cache: 'pnpm' + + - name: Install deps + run: pnpm install + env: + CYPRESS_INSTALL_BINARY: 0 + + - name: Run release + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + if [ $RELEASE_TYPE = 'stable' ]; then + pnpm run release + else + pnpm run release --prerelease $RELEASE_TYPE + fi + RELEASE_VERSION=$(jq -r '.version' package.json) + echo "RELEASE_VERSION=$RELEASE_VERSION" + echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_ENV + env: + RELEASE_TYPE: ${{ github.event.inputs.releaseType }} + + - name: Switch to release branch + run: | + RELEASE_BRANCH="chore/release/$RELEASE_VERSION" + echo "RELEASE_BRANCH=$RELEASE_BRANCH" + echo "RELEASE_BRANCH=$RELEASE_BRANCH" >> $GITHUB_ENV + git switch -c $RELEASE_BRANCH + git push origin $RELEASE_BRANCH -f + + - name: Create draft PR + run: | + gh pr create \ + --base $GITHUB_REF_NAME \ + --head $RELEASE_BRANCH \ + --draft \ + --title "chore(release): $RELEASE_VERSION" \ + --body " + Release for $RELEASE_VERSION + + - [ ] Completed manual release tasks + - [ ] Link release checklist issue + + --- + + - Checklist: TODO + " + env: + GH_TOKEN: ${{ github.token }} From 012f4315b91df0e27d8fe767c0ef2e5b0c869079 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Sun, 30 Jun 2024 23:44:22 +0200 Subject: [PATCH 02/12] Apply suggestions from code review --- .github/workflows/prepare-release-pr.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/prepare-release-pr.yml b/.github/workflows/prepare-release-pr.yml index d3a6d50934a..6d54de986ae 100644 --- a/.github/workflows/prepare-release-pr.yml +++ b/.github/workflows/prepare-release-pr.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: releaseType: - description: 'The type of release to prepare.' + description: 'The type of release to prepare a PR for.' required: true type: choice default: 'stable' @@ -74,8 +74,7 @@ jobs: --body " Release for $RELEASE_VERSION - - [ ] Completed manual release tasks - - [ ] Link release checklist issue + - [ ] Completed manual changes/tasks for this release --- From 5d5e4dd771797efcccd811415eadda4e50fe601a Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Sun, 30 Jun 2024 23:46:28 +0200 Subject: [PATCH 03/12] Apply suggestions from code review --- .github/workflows/prepare-release-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prepare-release-pr.yml b/.github/workflows/prepare-release-pr.yml index 6d54de986ae..146e5c27d9f 100644 --- a/.github/workflows/prepare-release-pr.yml +++ b/.github/workflows/prepare-release-pr.yml @@ -56,7 +56,7 @@ jobs: env: RELEASE_TYPE: ${{ github.event.inputs.releaseType }} - - name: Switch to release branch + - name: Switch to and push release branch run: | RELEASE_BRANCH="chore/release/$RELEASE_VERSION" echo "RELEASE_BRANCH=$RELEASE_BRANCH" From 0b17c7a9b6596da90c2eac88a22af0f7c6bc0ca7 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Sun, 30 Jun 2024 23:58:32 +0200 Subject: [PATCH 04/12] checkout all commits --- .github/workflows/prepare-release-pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/prepare-release-pr.yml b/.github/workflows/prepare-release-pr.yml index 146e5c27d9f..3c1e75f8fc3 100644 --- a/.github/workflows/prepare-release-pr.yml +++ b/.github/workflows/prepare-release-pr.yml @@ -26,6 +26,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + with: + fetch-depth: 0 - name: Install pnpm uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0 From f9e99e7ca6041aa575749d5de52a62c79850894e Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Tue, 2 Jul 2024 22:20:30 +0200 Subject: [PATCH 05/12] chore: intentional format issue --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 0b5903408da..26c1a4aa6e5 100644 --- a/src/index.ts +++ b/src/index.ts @@ -83,5 +83,5 @@ export type { SystemModule } from './modules/system'; export type { VehicleModule } from './modules/vehicle'; export type { WordModule } from './modules/word'; export type { Randomizer } from './randomizer'; -export { SimpleFaker, simpleFaker } from './simple-faker'; +export { SimpleFaker, simpleFaker } from './simple-faker'; export { mergeLocales } from './utils/merge-locales'; From a6f96d8b02f0b8b925914ba751ff3b2d82e192a7 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Tue, 2 Jul 2024 22:23:36 +0200 Subject: [PATCH 06/12] Revert "chore: intentional format issue" This reverts commit f9e99e7ca6041aa575749d5de52a62c79850894e. --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 26c1a4aa6e5..0b5903408da 100644 --- a/src/index.ts +++ b/src/index.ts @@ -83,5 +83,5 @@ export type { SystemModule } from './modules/system'; export type { VehicleModule } from './modules/vehicle'; export type { WordModule } from './modules/word'; export type { Randomizer } from './randomizer'; -export { SimpleFaker, simpleFaker } from './simple-faker'; +export { SimpleFaker, simpleFaker } from './simple-faker'; export { mergeLocales } from './utils/merge-locales'; From efc25384ea29ab3633692266b19e449713175a79 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Tue, 2 Jul 2024 22:24:19 +0200 Subject: [PATCH 07/12] chore: intentional format issue --- src/locales/af_ZA/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/locales/af_ZA/index.ts b/src/locales/af_ZA/index.ts index 3bde3758c49..e00821dd1f3 100644 --- a/src/locales/af_ZA/index.ts +++ b/src/locales/af_ZA/index.ts @@ -14,7 +14,9 @@ import phone_number from './phone_number'; const af_ZA: LocaleDefinition = { cell_phone, company, + internet, + location, metadata, person, From b08ee77d09565b4a9e81d08a380db99197cfd0e5 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Tue, 2 Jul 2024 22:24:41 +0200 Subject: [PATCH 08/12] Revert "chore: intentional format issue" This reverts commit efc25384ea29ab3633692266b19e449713175a79. --- src/locales/af_ZA/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/locales/af_ZA/index.ts b/src/locales/af_ZA/index.ts index e00821dd1f3..3bde3758c49 100644 --- a/src/locales/af_ZA/index.ts +++ b/src/locales/af_ZA/index.ts @@ -14,9 +14,7 @@ import phone_number from './phone_number'; const af_ZA: LocaleDefinition = { cell_phone, company, - internet, - location, metadata, person, From 48777fdb3b99400d6cabb4e2efceaece1427a443 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Tue, 2 Jul 2024 22:25:07 +0200 Subject: [PATCH 09/12] chore: improve TODO text --- .github/workflows/prepare-release-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prepare-release-pr.yml b/.github/workflows/prepare-release-pr.yml index 3c1e75f8fc3..4fd85c7cf5f 100644 --- a/.github/workflows/prepare-release-pr.yml +++ b/.github/workflows/prepare-release-pr.yml @@ -80,7 +80,7 @@ jobs: --- - - Checklist: TODO + - Checklist: TODO add link to issue " env: GH_TOKEN: ${{ github.token }} From feb2f15d59558624bdf0de7f5fb9a46001f1dbde Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 22:36:27 +0200 Subject: [PATCH 10/12] chore: add github-actions[bot] user-id --- .github/workflows/prepare-release-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prepare-release-pr.yml b/.github/workflows/prepare-release-pr.yml index 4fd85c7cf5f..69d49d4cf1e 100644 --- a/.github/workflows/prepare-release-pr.yml +++ b/.github/workflows/prepare-release-pr.yml @@ -46,7 +46,7 @@ jobs: - name: Run release run: | git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" if [ $RELEASE_TYPE = 'stable' ]; then pnpm run release else From 1407674760a929034892ee802dfa9d4b11bcea7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 22:40:38 +0200 Subject: [PATCH 11/12] chore: remove debug logs --- .github/workflows/prepare-release-pr.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/prepare-release-pr.yml b/.github/workflows/prepare-release-pr.yml index 69d49d4cf1e..7121cb2a129 100644 --- a/.github/workflows/prepare-release-pr.yml +++ b/.github/workflows/prepare-release-pr.yml @@ -53,7 +53,6 @@ jobs: pnpm run release --prerelease $RELEASE_TYPE fi RELEASE_VERSION=$(jq -r '.version' package.json) - echo "RELEASE_VERSION=$RELEASE_VERSION" echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_ENV env: RELEASE_TYPE: ${{ github.event.inputs.releaseType }} @@ -61,7 +60,6 @@ jobs: - name: Switch to and push release branch run: | RELEASE_BRANCH="chore/release/$RELEASE_VERSION" - echo "RELEASE_BRANCH=$RELEASE_BRANCH" echo "RELEASE_BRANCH=$RELEASE_BRANCH" >> $GITHUB_ENV git switch -c $RELEASE_BRANCH git push origin $RELEASE_BRANCH -f From 636a6b366b34300aedb777aefb5e4b5288a07151 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Wed, 3 Jul 2024 01:00:38 +0200 Subject: [PATCH 12/12] chore: add name --- .github/workflows/prepare-release-pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/prepare-release-pr.yml b/.github/workflows/prepare-release-pr.yml index 7121cb2a129..96445057332 100644 --- a/.github/workflows/prepare-release-pr.yml +++ b/.github/workflows/prepare-release-pr.yml @@ -20,6 +20,7 @@ permissions: jobs: prepare_release_pr: + name: Prepare Release PR runs-on: ubuntu-latest timeout-minutes: 10