diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 5ae53dc6e..c68f3b797 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -25,7 +25,7 @@ on: type: boolean env: - DRY_RUN_ARG: ${{ inputs.dryRun && '--dry-run' || '' }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} jobs: @@ -58,21 +58,19 @@ jobs: run: pnpm build - name: Create Release and Tags shell: bash - run: pnpm turbo-version -b ${{inputs.preReleaseVersion}} + run: pnpm turbo-version -b ${{ inputs.preReleaseVersion }} - name: Publish to NPM shell: bash - run: pnpx tsx scripts/publish.ts --tag next ${{inputs.dryRun && '--dry-run' || ''}} - env: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + run: pnpx tsx scripts/publish.ts --tag next ${{ inputs.dryRun && '--dry-run' || '' }} - name: Log git changes - if: ${{inputs.dryRun}} + if: ${{ inputs.dryRun }} run: | git diff ..origin/main echo "DRY RUN: No changes were made." - name: Push Tags and Commits id: push-tags shell: bash - if: ${{!inputs.dryRun}} + if: ${{ !inputs.dryRun }} run: | echo "Git log:" git log --oneline -n 5 @@ -84,8 +82,6 @@ jobs: git push --tags --no-verify && git push --no-verify # pass the release tag to the next step echo "RELEASE_TAG=$RELEASE_TAG" >> $GITHUB_OUTPUT - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: @@ -94,4 +90,4 @@ jobs: prerelease: true repository: webdriverio-community/wdio-electron-service tag_name: ${{ steps.push-tags.outputs.RELEASE_TAG }} - token: ${{ secrets.GITHUB_TOKEN }} + token: $GITHUB_TOKEN diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a6cc21bbc..8d8179fd4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,9 +20,8 @@ on: type: boolean env: - DRY_RUN_ARG: ${{ inputs.dryRun && '--dry-run' || '' }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - HUSKY: '0' jobs: release: @@ -30,6 +29,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + ssh-key: ${{ secrets.DEPLOY_KEY }} ref: 'main' fetch-depth: 0 - uses: actions/setup-node@v4 @@ -47,37 +47,36 @@ jobs: run: | git config --global user.email "bot@webdriver.io" git config --global user.name "WebdriverIO Release Bot" - - name: Pushing to the protected branch 'main' - uses: CasperWA/push-protected@v2 - with: - token: ${{ secrets.DEPLOY_PAT }} - branch: main - name: Install Dependencies run: pnpm install --frozen-lockfile - name: Build run: pnpm build - name: Create Release and Tags shell: bash - run: pnpm turbo-version -b ${{inputs.releaseVersion}} + run: pnpm turbo-version -b ${{ inputs.releaseVersion }} - name: Publish to NPM shell: bash - run: pnpx tsx scripts/publish.ts --tag latest ${{inputs.dryRun && '--dry-run' || ''}} - env: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + run: pnpx tsx scripts/publish.ts --tag latest ${{ inputs.dryRun && '--dry-run' || '' }} - name: Log git changes - if: ${{inputs.dryRun}} + if: ${{ inputs.dryRun }} run: | git diff ..origin/main echo "DRY RUN: No changes were made." - name: Push Tags and Commits id: push-tags shell: bash - if: ${{!inputs.dryRun}} + if: ${{ !inputs.dryRun }} run: | - git push --tags && git push - echo "RELEASE_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))" >> $GITHUB_OUTPUT - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + echo "Git log:" + git log --oneline -n 5 + # get release tag + RELEASE_TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) + echo "Release tag: $RELEASE_TAG" + echo "Pushing tags and commits..." + # push tags and commits without running the pre-push hook + git push --tags --no-verify && git push --no-verify + # pass the release tag to the next step + echo "RELEASE_TAG=$RELEASE_TAG" >> $GITHUB_OUTPUT - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: @@ -86,4 +85,4 @@ jobs: prerelease: false repository: goosewobbler/zutron tag_name: ${{ steps.push-tags.outputs.RELEASE_TAG }} - token: ${{ secrets.GITHUB_TOKEN }} + token: $GITHUB_TOKEN