From dbf0e776f53157f239c9595676c44010033b5af0 Mon Sep 17 00:00:00 2001 From: japborst Date: Wed, 5 Oct 2022 08:23:00 +0200 Subject: [PATCH 1/4] Revert default branch --- .github/workflows/build.yaml | 3 ++- .github/workflows/deploy-website.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9ce167f26a..ce786ba4a3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,8 @@ name: Build and verify on: pull_request: push: - branches: [$default-branch] + branches: + - master permissions: contents: read jobs: diff --git a/.github/workflows/deploy-website.yaml b/.github/workflows/deploy-website.yaml index 6582744284..723428e830 100644 --- a/.github/workflows/deploy-website.yaml +++ b/.github/workflows/deploy-website.yaml @@ -2,7 +2,8 @@ name: Update `error-prone.picnic.tech` website content on: pull_request: push: - branches: [$default-branch] + branches: + - master permissions: contents: read id-token: write From c779c09988f359b491bc50eda0a6c2e10ec66c41 Mon Sep 17 00:00:00 2001 From: japborst Date: Wed, 5 Oct 2022 12:37:39 +0200 Subject: [PATCH 2/4] Use single line --- .github/workflows/build.yaml | 3 +-- .github/workflows/deploy-website.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ce786ba4a3..3f00da830c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,8 +2,7 @@ name: Build and verify on: pull_request: push: - branches: - - master + branches: [master] permissions: contents: read jobs: diff --git a/.github/workflows/deploy-website.yaml b/.github/workflows/deploy-website.yaml index 723428e830..568cb5abf0 100644 --- a/.github/workflows/deploy-website.yaml +++ b/.github/workflows/deploy-website.yaml @@ -2,8 +2,7 @@ name: Update `error-prone.picnic.tech` website content on: pull_request: push: - branches: - - master + branches: [master] permissions: contents: read id-token: write From 884e108c838510d1509d6ae2437446d966d2c532 Mon Sep 17 00:00:00 2001 From: japborst Date: Wed, 5 Oct 2022 12:38:24 +0200 Subject: [PATCH 3/4] Add spaces for consistency --- .github/workflows/build.yaml | 2 +- .github/workflows/deploy-website.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3f00da830c..162a191936 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,7 @@ name: Build and verify on: pull_request: push: - branches: [master] + branches: [ master ] permissions: contents: read jobs: diff --git a/.github/workflows/deploy-website.yaml b/.github/workflows/deploy-website.yaml index 568cb5abf0..b632e9aaec 100644 --- a/.github/workflows/deploy-website.yaml +++ b/.github/workflows/deploy-website.yaml @@ -2,7 +2,7 @@ name: Update `error-prone.picnic.tech` website content on: pull_request: push: - branches: [master] + branches: [ master ] permissions: contents: read id-token: write From 15e117c9983b4aa265dd6e547c97e7ac9040ee59 Mon Sep 17 00:00:00 2001 From: japborst Date: Wed, 5 Oct 2022 12:41:49 +0200 Subject: [PATCH 4/4] Hardcode master --- .github/workflows/deploy-website.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-website.yaml b/.github/workflows/deploy-website.yaml index b632e9aaec..d4a96cb354 100644 --- a/.github/workflows/deploy-website.yaml +++ b/.github/workflows/deploy-website.yaml @@ -33,7 +33,7 @@ jobs: - name: Upload website as artifact uses: actions/upload-pages-artifact@v1.0.4 deploy: - if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch) + if: github.ref == 'refs/heads/master' needs: build runs-on: ubuntu-22.04 environment: