From 55f9fe016c7f1057c493c1c18d1ba514cb777b5d Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Fri, 1 Sep 2023 06:56:12 -0700 Subject: [PATCH 01/10] test add token --- .github/workflows/build-and-deploy.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index 40e039d0..50763fc4 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.3.1 + uses: actions/checkout@v3 with: persist-credentials: false @@ -22,7 +22,8 @@ jobs: - name: Deploy to site if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'carpentries/glosario' }} - uses: JamesIves/github-pages-deploy-action@4.1.5 + uses: JamesIves/github-pages-deploy-action@4 with: branch: site folder: _gh-site + token: ${{ secrets.GITHUB_TOKEN }} From b5e629f0ffeb339d9a81e7a1319fc36df555356a Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Fri, 1 Sep 2023 06:56:54 -0700 Subject: [PATCH 02/10] fix tag --- .github/workflows/build-and-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index 50763fc4..cb6f6e24 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -22,7 +22,7 @@ jobs: - name: Deploy to site if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'carpentries/glosario' }} - uses: JamesIves/github-pages-deploy-action@4 + uses: JamesIves/github-pages-deploy-action@v4 with: branch: site folder: _gh-site From 87f0fb9fe9491184da78ced11e16b4bbfaafe450 Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Fri, 1 Sep 2023 06:57:59 -0700 Subject: [PATCH 03/10] write contents --- .github/workflows/build-and-deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index cb6f6e24..e452329e 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -4,6 +4,8 @@ name: Build and Deploy Glossary Website jobs: build-and-deploy: + permissions: + contents: write runs-on: ubuntu-latest steps: - name: Checkout From 837f6aec968e633458f309ed52fc3fc818afe812 Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Fri, 1 Sep 2023 06:58:55 -0700 Subject: [PATCH 04/10] smol test --- .github/workflows/build-and-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index e452329e..48e0b960 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -23,7 +23,7 @@ jobs: run: ls -alh _gh-site && ls -alh _gh-site/_data - name: Deploy to site - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'carpentries/glosario' }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'zkamvar/glosario' }} uses: JamesIves/github-pages-deploy-action@v4 with: branch: site From 7952b8e0ab92c15eea6f48c4e2999e8f64c43d14 Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Fri, 1 Sep 2023 06:59:33 -0700 Subject: [PATCH 05/10] remove contents req --- .github/workflows/build-and-deploy.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index 48e0b960..f40755ff 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -4,8 +4,6 @@ name: Build and Deploy Glossary Website jobs: build-and-deploy: - permissions: - contents: write runs-on: ubuntu-latest steps: - name: Checkout From 62a09490372704c6c8358f96f4950a60feb51f19 Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Fri, 1 Sep 2023 07:00:49 -0700 Subject: [PATCH 06/10] get action to run again --- .github/workflows/build-and-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index f40755ff..c42363b1 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -23,7 +23,7 @@ jobs: - name: Deploy to site if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'zkamvar/glosario' }} uses: JamesIves/github-pages-deploy-action@v4 - with: + with: branch: site folder: _gh-site token: ${{ secrets.GITHUB_TOKEN }} From f4e5240cfceef4bc6dfe5965a5b598f1302da6da Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Fri, 1 Sep 2023 07:04:21 -0700 Subject: [PATCH 07/10] dispatch --- .github/workflows/build-and-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index c42363b1..b878e700 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -1,4 +1,4 @@ -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] name: Build and Deploy Glossary Website @@ -23,7 +23,7 @@ jobs: - name: Deploy to site if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'zkamvar/glosario' }} uses: JamesIves/github-pages-deploy-action@v4 - with: + with: branch: site folder: _gh-site token: ${{ secrets.GITHUB_TOKEN }} From f60dbf2dbc54d048c477c58843541f14bf91b89f Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Fri, 1 Sep 2023 07:05:41 -0700 Subject: [PATCH 08/10] fix yaml lint warnings --- .github/workflows/yaml-lint.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/yaml-lint.yaml b/.github/workflows/yaml-lint.yaml index afba098a..b1f10ae0 100644 --- a/.github/workflows/yaml-lint.yaml +++ b/.github/workflows/yaml-lint.yaml @@ -4,14 +4,13 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-latest strategy: matrix: python-version: [3.8] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: From 39ea955c9f6d9ee5f77ccb22a515c5e2cfaecf12 Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Fri, 1 Sep 2023 07:06:49 -0700 Subject: [PATCH 09/10] fix more warn --- .github/workflows/yaml-lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/yaml-lint.yaml b/.github/workflows/yaml-lint.yaml index b1f10ae0..50a37311 100644 --- a/.github/workflows/yaml-lint.yaml +++ b/.github/workflows/yaml-lint.yaml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Install dependencies From b3764e1291271ee49d23f859ff6fbac39ae25acd Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Fri, 1 Sep 2023 07:07:00 -0700 Subject: [PATCH 10/10] switch back to correct org --- .github/workflows/build-and-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index b878e700..217f0c01 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -21,7 +21,7 @@ jobs: run: ls -alh _gh-site && ls -alh _gh-site/_data - name: Deploy to site - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'zkamvar/glosario' }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'carpentries/glosario' }} uses: JamesIves/github-pages-deploy-action@v4 with: branch: site