From acf717c48ce1166a2af23dd404f578c59f9f1983 Mon Sep 17 00:00:00 2001 From: Yuji Yaginuma Date: Tue, 25 Jun 2024 17:16:50 +0900 Subject: [PATCH 1/4] Revert "Merge pull request #50 from ginzarb/fix-deploy-last-second" This reverts commit b02402f6096b1f66645771d1e0e1d40ef39cb30b, reversing changes made to 6c5e9a73fe8da0dcab77740950798240a4d54fbc. --- .github/workflows/deploy.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dff1a1c..5c30831 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,13 +23,6 @@ jobs: - name: Install dependencies run: bundle install - - name: Clone target repository - run: | - git clone --quiet https://github.com/ginzarb/ginzarb.github.io.git build - pushd build - git checkout -b master - popd - - name: Build with Middleman run: bundle exec middleman build @@ -39,6 +32,7 @@ jobs: cd build git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git checkout -b master git add -A git commit -m 'Reflect changed sources' git push \ No newline at end of file From 89ec4693c7880815df3f50a922fbc2e5921e56c7 Mon Sep 17 00:00:00 2001 From: Yuji Yaginuma Date: Tue, 25 Jun 2024 17:16:58 +0900 Subject: [PATCH 2/4] Revert "Merge pull request #49 from ginzarb/fix-deploy-third" This reverts commit 6c5e9a73fe8da0dcab77740950798240a4d54fbc, reversing changes made to 282a93a8254f722a6d763f99b67729b4d7c0540f. --- .github/workflows/deploy.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5c30831..3dbc80e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,6 +23,13 @@ jobs: - name: Install dependencies run: bundle install + - name: Clone target repository + run: | + git clone --quiet https://github.com/ginzarb/ginzarb.github.io.git build + pushd build + git checkout -b master + popd + - name: Build with Middleman run: bundle exec middleman build @@ -30,9 +37,12 @@ jobs: if: github.ref == 'refs/heads/source' run: | cd build - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git checkout -b master git add -A git commit -m 'Reflect changed sources' - git push \ No newline at end of file + git push -f https://$GITHUB_TOKEN@github.com/ginzarb/ginzarb.github.io.git master + env: + GIT_COMMITTER_NAME: willnet + GIT_COMMITTER_EMAIL: netwillnet@gmail.com + GIT_AUTHOR_NAME: willnet + GIT_AUTHOR_EMAIL: netwillnet@gmail.com + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 90784f2db7c8b2dc43994848b9f56e2ac3df84ba Mon Sep 17 00:00:00 2001 From: Yuji Yaginuma Date: Tue, 25 Jun 2024 17:17:06 +0900 Subject: [PATCH 3/4] Revert "Merge pull request #48 from ginzarb/fix-deploy-again" This reverts commit 282a93a8254f722a6d763f99b67729b4d7c0540f, reversing changes made to 6a71365d504ce51335677691761648d6da1b6a33. --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3dbc80e..211ee6a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,7 +39,7 @@ jobs: cd build git add -A git commit -m 'Reflect changed sources' - git push -f https://$GITHUB_TOKEN@github.com/ginzarb/ginzarb.github.io.git master + git push -f origin master env: GIT_COMMITTER_NAME: willnet GIT_COMMITTER_EMAIL: netwillnet@gmail.com From f1f92b242d472a636035bcba16de8d65100a30f3 Mon Sep 17 00:00:00 2001 From: Yuji Yaginuma Date: Tue, 25 Jun 2024 17:17:15 +0900 Subject: [PATCH 4/4] Revert "Merge pull request #47 from ginzarb/fix-deploy" This reverts commit 6a71365d504ce51335677691761648d6da1b6a33, reversing changes made to 4c9b54fd96247469e4faa5ff6fb40c190ca91769. --- .github/workflows/deploy.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 211ee6a..3b1fe70 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,9 +9,6 @@ jobs: build: runs-on: ubuntu-latest - permissions: - contents: write - steps: - uses: actions/checkout@v4 @@ -45,4 +42,4 @@ jobs: GIT_COMMITTER_EMAIL: netwillnet@gmail.com GIT_AUTHOR_NAME: willnet GIT_AUTHOR_EMAIL: netwillnet@gmail.com - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file