From 76b080ef1c8d6a247271a7ed9e4d136541679935 Mon Sep 17 00:00:00 2001 From: Mark Vayngrib Date: Fri, 15 Mar 2024 11:57:59 -0400 Subject: [PATCH 1/4] chore: bring back lerna-release-action --- .github/workflows/publish.yaml | 31 ++++++++++++++++ .github/workflows/version-dispatch.yaml | 18 ++++++++++ .github/workflows/version.yaml | 47 +++++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 .github/workflows/publish.yaml create mode 100644 .github/workflows/version-dispatch.yaml create mode 100644 .github/workflows/version.yaml diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml new file mode 100644 index 00000000..0d53559c --- /dev/null +++ b/.github/workflows/publish.yaml @@ -0,0 +1,31 @@ +name: Publish +on: + pull_request: + types: + - closed + workflow_dispatch: + +jobs: + publish: + if: github.event_name == 'workflow_dispatch' || (github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'publish-on-merge')) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha }} + - uses: ExodusMovement/actions/setup/lerna@v3 + with: + npm-token: ${{ secrets.NPM_PUBLISH_TOKEN }} + - name: Install dependencies + run: yarn install --immutable + - name: Build + run: yarn build + - uses: ExodusMovement/lerna-release-action/publish@master + id: publish + with: + github-token: ${{ secrets.GH_AUTOMATION_PAT }} + - uses: ExodusMovement/athena-action@master + with: + github-token: ${{ secrets.GH_AUTOMATION_PAT }} + package-versions: ${{ steps.publish.outputs.published-packages }} + repositories: '[{ "owner": "ExodusMovement", "name": "exodus-browser", "packageFile": "src/package.json", "installCommand": "yarn install --ignore-engines --cwd src", "npmToken": "${{ secrets.NPM_TOKEN }}" }, { "owner": "ExodusMovement", "name": "exodus-mobile", "packageFile": "src/package.json", "installCommand": "yarn install --ignore-engines --cwd src", "npmToken": "${{ secrets.NPM_TOKEN }}" }, { "owner": "ExodusMovement", "name": "magic-eden", "packageFile": "apps/browser/src/package.json", "installCommand": "yarn install --ignore-engines --cwd src", "npmToken": "${{ secrets.NPM_TOKEN }}" }, { "owner": "ExodusMovement", "name": "magic-eden", "packageFile": "apps/mobile/src/package.json", "installCommand": "yarn install --ignore-engines --cwd src", "npmToken": "${{ secrets.NPM_TOKEN }}" }]' diff --git a/.github/workflows/version-dispatch.yaml b/.github/workflows/version-dispatch.yaml new file mode 100644 index 00000000..8bf145e9 --- /dev/null +++ b/.github/workflows/version-dispatch.yaml @@ -0,0 +1,18 @@ +name: Version dispatch +on: + pull_request: + types: + - closed + +jobs: + invoke-versioning: + if: contains(github.event.pull_request.labels.*.name , 'publish-on-merge') == false && contains(github.event.pull_request.labels.*.name , 'skip-release') == false + name: Invoke version workflow + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ExodusMovement/lerna-release-action/version-dispatch@master + with: + version-workflow-id: version.yaml + github-token: ${{ secrets.GH_AUTOMATION_PAT }} + exclude-commit-types: chore,docs,test,ci diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yaml new file mode 100644 index 00000000..5c823d76 --- /dev/null +++ b/.github/workflows/version.yaml @@ -0,0 +1,47 @@ +name: Version +on: + workflow_dispatch: + inputs: + packages: + description: 'Selected packages as comma separated string, e.g. modules/storage-spec,libraries/formatting' + type: string + required: true + version-strategy: + type: choice + options: + - conventional-commits + - patch + - minor + - major + - prerelease + - prepatch + - preminor + - premajor + default: 'conventional-commits' + assignee: + description: 'Overrides the default assignee, which is the user to trigger this workflow.' + type: string + required: false + +jobs: + version: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: ExodusMovement/actions/setup/lerna@master + with: + npm-token: ${{ secrets.NPM_TOKEN }} + - name: Install dependencies + run: yarn install --immutable + - name: Prepare + run: yarn prepare + - name: Version + uses: ExodusMovement/lerna-release-action/version@master + with: + github-token: ${{ secrets.GH_AUTOMATION_PAT }} + packages: ${{ inputs.packages }} + assignee: ${{ inputs.assignee }} + version-strategy: ${{ inputs.version-strategy }} + auto-merge: true From 8780396446148e48e3a64bbe9423cd31008d4ecb Mon Sep 17 00:00:00 2001 From: Mark Vayngrib Date: Fri, 15 Mar 2024 11:59:50 -0400 Subject: [PATCH 2/4] chore: pin versions --- .github/workflows/publish.yaml | 4 ++-- .github/workflows/version-dispatch.yaml | 2 +- .github/workflows/version.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 0d53559c..f7d59bd5 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,14 +13,14 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ExodusMovement/actions/setup/lerna@v3 + - uses: ExodusMovement/actions/setup/lerna@06f077a9081a1e973586dde8870e7116873b9b84 with: npm-token: ${{ secrets.NPM_PUBLISH_TOKEN }} - name: Install dependencies run: yarn install --immutable - name: Build run: yarn build - - uses: ExodusMovement/lerna-release-action/publish@master + - uses: ExodusMovement/lerna-release-action/publish@5bc3d09d8259df70e96766ae300b8d33aa0eb08d id: publish with: github-token: ${{ secrets.GH_AUTOMATION_PAT }} diff --git a/.github/workflows/version-dispatch.yaml b/.github/workflows/version-dispatch.yaml index 8bf145e9..6c793cb0 100644 --- a/.github/workflows/version-dispatch.yaml +++ b/.github/workflows/version-dispatch.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: ExodusMovement/lerna-release-action/version-dispatch@master + - uses: ExodusMovement/lerna-release-action/version-dispatch@5bc3d09d8259df70e96766ae300b8d33aa0eb08d with: version-workflow-id: version.yaml github-token: ${{ secrets.GH_AUTOMATION_PAT }} diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yaml index 5c823d76..721920cf 100644 --- a/.github/workflows/version.yaml +++ b/.github/workflows/version.yaml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: ExodusMovement/actions/setup/lerna@master + - uses: ExodusMovement/actions/setup/lerna@06f077a9081a1e973586dde8870e7116873b9b84 with: npm-token: ${{ secrets.NPM_TOKEN }} - name: Install dependencies @@ -38,7 +38,7 @@ jobs: - name: Prepare run: yarn prepare - name: Version - uses: ExodusMovement/lerna-release-action/version@master + uses: ExodusMovement/lerna-release-action/version@5bc3d09d8259df70e96766ae300b8d33aa0eb08d with: github-token: ${{ secrets.GH_AUTOMATION_PAT }} packages: ${{ inputs.packages }} From a547402099f04de4cb53cff9a23fb5c2161d5c95 Mon Sep 17 00:00:00 2001 From: Mark Vayngrib Date: Fri, 15 Mar 2024 12:02:29 -0400 Subject: [PATCH 3/4] chore: rm athena for now --- .github/workflows/publish.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f7d59bd5..244c5e21 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -24,8 +24,3 @@ jobs: id: publish with: github-token: ${{ secrets.GH_AUTOMATION_PAT }} - - uses: ExodusMovement/athena-action@master - with: - github-token: ${{ secrets.GH_AUTOMATION_PAT }} - package-versions: ${{ steps.publish.outputs.published-packages }} - repositories: '[{ "owner": "ExodusMovement", "name": "exodus-browser", "packageFile": "src/package.json", "installCommand": "yarn install --ignore-engines --cwd src", "npmToken": "${{ secrets.NPM_TOKEN }}" }, { "owner": "ExodusMovement", "name": "exodus-mobile", "packageFile": "src/package.json", "installCommand": "yarn install --ignore-engines --cwd src", "npmToken": "${{ secrets.NPM_TOKEN }}" }, { "owner": "ExodusMovement", "name": "magic-eden", "packageFile": "apps/browser/src/package.json", "installCommand": "yarn install --ignore-engines --cwd src", "npmToken": "${{ secrets.NPM_TOKEN }}" }, { "owner": "ExodusMovement", "name": "magic-eden", "packageFile": "apps/mobile/src/package.json", "installCommand": "yarn install --ignore-engines --cwd src", "npmToken": "${{ secrets.NPM_TOKEN }}" }]' From cf26eead0b836687728ad01a2c54ede668dc5837 Mon Sep 17 00:00:00 2001 From: Mark Vayngrib Date: Fri, 15 Mar 2024 12:03:41 -0400 Subject: [PATCH 4/4] chore: bump actions --- .github/workflows/publish.yaml | 2 +- .github/workflows/version.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 244c5e21..28049bef 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ExodusMovement/actions/setup/lerna@06f077a9081a1e973586dde8870e7116873b9b84 + - uses: ExodusMovement/actions/setup/lerna@65b395a82884455e8dc0cbc32355d8864f1ec30c with: npm-token: ${{ secrets.NPM_PUBLISH_TOKEN }} - name: Install dependencies diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yaml index 721920cf..35cddd97 100644 --- a/.github/workflows/version.yaml +++ b/.github/workflows/version.yaml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: ExodusMovement/actions/setup/lerna@06f077a9081a1e973586dde8870e7116873b9b84 + - uses: ExodusMovement/actions/setup/lerna@65b395a82884455e8dc0cbc32355d8864f1ec30c with: npm-token: ${{ secrets.NPM_TOKEN }} - name: Install dependencies