diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 6ec6de91..ffba23d6 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -1,14 +1,10 @@ name: Deploy GitHub Pages on: - release: - types: [ published ] workflow_dispatch: permissions: contents: read - pages: write - id-token: write concurrency: group: pages @@ -32,14 +28,24 @@ jobs: with: source: ./ destination: ./_site + env: + JEKYLL_GITHUB_TOKEN: ${{ github.token }} + + - name: Sanity-check Jekyll output + run: test -f _site/index.html && test -f _site/CNAME - name: Upload Pages artifact uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 #v5.0.0 + with: + path: ./_site deploy: name: Deploy to GitHub Pages needs: build runs-on: ubuntu-22.04 + permissions: + pages: write + id-token: write environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index 9c218944..a6190df3 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -19,6 +19,7 @@ jobs: name: Create GitHub release permissions: contents: write + actions: write runs-on: ubuntu-22.04 environment: foss-production steps: @@ -83,6 +84,12 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Trigger GitHub Pages deployment + if: "!(github.event_name == 'workflow_dispatch' && inputs.dry_run)" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: gh workflow run pages.yml --ref main + release-gplay: name: Create Google Play release runs-on: ubuntu-22.04 @@ -126,6 +133,9 @@ jobs: bundler-cache: true working-directory: fastlane + - name: Verify fastlane Bundler wiring + run: bundle exec fastlane --version + - name: Assemble beta and upload to Google Play if: contains(github.ref_name, '-beta') && !(github.event_name == 'workflow_dispatch' && inputs.dry_run) run: bundle exec fastlane beta