From 7bb3a9a9dfe3ea5b9617c67f1a7c6b6f4e624210 Mon Sep 17 00:00:00 2001 From: atteggiani Date: Mon, 6 Nov 2023 17:13:33 +1100 Subject: [PATCH 01/12] test --- .github/workflows/pr_preview.yml | 38 ++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index 5cc6ee649..ddbf7db12 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -42,17 +42,37 @@ jobs: if: ${{ github.event.action == 'closed' }} runs-on: ubuntu-latest steps: + - name: TEST1 + shell: bash + run: | + echo "TEST before checkout" + echo "Home folder:" + ls ~ + echo "PR-PREVIEW folder:" + ls pr-preview - name: Checkout uses: actions/checkout@v3 - - - name: Python setup - uses: actions/setup-python@v4 with: - python-version: 3.x + ref: gh-pages + + - name: Remove pr-preview + shell: bash + run: | + echo "TEST after checkout" + echo "Home folder:" + ls ~ + echo "PR-PREVIEW folder:" + ls pr-preview - - name: Clean preview - uses: access-nri/pr-preview-action@v2.1.1 - with: - action: remove - pr-number: ${{ github.event.number }} \ No newline at end of file + + # - name: Python setup + # uses: actions/setup-python@v4 + # with: + # python-version: 3.x + + # - name: Clean preview + # uses: access-nri/pr-preview-action@v2.1.1 + # with: + # action: remove + # pr-number: ${{ github.event.number }} \ No newline at end of file From d08879fda1a1476d45200bf317d39b58f36ecdc9 Mon Sep 17 00:00:00 2001 From: atteggiani Date: Mon, 6 Nov 2023 17:17:25 +1100 Subject: [PATCH 02/12] test --- .github/workflows/pr_preview.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index ddbf7db12..cf0442a35 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -3,9 +3,9 @@ name: PR preview on: pull_request: types: - - opened - - reopened - - synchronize + # - opened + # - reopened + # - synchronize - closed concurrency: From 03766cc39472a9eda5f07ea73c8baf8403ca12e4 Mon Sep 17 00:00:00 2001 From: atteggiani Date: Mon, 6 Nov 2023 17:19:19 +1100 Subject: [PATCH 03/12] test --- .github/workflows/pr_preview.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index cf0442a35..5b29db85d 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -42,15 +42,6 @@ jobs: if: ${{ github.event.action == 'closed' }} runs-on: ubuntu-latest steps: - - name: TEST1 - shell: bash - run: | - echo "TEST before checkout" - echo "Home folder:" - ls ~ - echo "PR-PREVIEW folder:" - ls pr-preview - - name: Checkout uses: actions/checkout@v3 with: From 76f597427c86578492a25d9253740005a5ae03cc Mon Sep 17 00:00:00 2001 From: atteggiani Date: Mon, 6 Nov 2023 17:29:03 +1100 Subject: [PATCH 04/12] test --- .github/workflows/pr_preview.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index 5b29db85d..a7d8c8e9c 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -50,11 +50,13 @@ jobs: - name: Remove pr-preview shell: bash run: | - echo "TEST after checkout" - echo "Home folder:" - ls ~ - echo "PR-PREVIEW folder:" - ls pr-preview + folder=pr-preview/pr-${{ github.event.number }} + if [ -z $folder ] + then + echo "$folder not found!" + exit 1 + fi + ls $folder # - name: Python setup From 8cf4618ea710ed38aa0cf59cbfbeb292083e0876 Mon Sep 17 00:00:00 2001 From: atteggiani Date: Mon, 6 Nov 2023 17:32:28 +1100 Subject: [PATCH 05/12] t --- .github/workflows/pr_preview.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index a7d8c8e9c..e76c7495a 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -3,9 +3,9 @@ name: PR preview on: pull_request: types: - # - opened - # - reopened - # - synchronize + - opened + - reopened + - synchronize - closed concurrency: From 31f4ace053ff970809bd3b0db8ae275e9dafc9f8 Mon Sep 17 00:00:00 2001 From: atteggiani Date: Mon, 6 Nov 2023 17:40:52 +1100 Subject: [PATCH 06/12] t --- .github/workflows/pr_preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index e76c7495a..02ec76981 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -56,7 +56,7 @@ jobs: echo "$folder not found!" exit 1 fi - ls $folder + rm -rf $folder # - name: Python setup From 6a2711f44a68fa6f79833bf9b5052d3d6951637b Mon Sep 17 00:00:00 2001 From: atteggiani Date: Mon, 6 Nov 2023 17:49:01 +1100 Subject: [PATCH 07/12] test --- .github/workflows/pr_preview.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index 02ec76981..c1135b5ce 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -57,8 +57,15 @@ jobs: exit 1 fi rm -rf $folder - - + + - name: Commit to gh-pages + uses: devops-infra/action-commit-push@master + with: + github_token: "${{ secrets.GITHUB_TOKEN }}" + commit_message: "Remove 'pr-preview/pr-${{ github.event.number }}' folder." + force: false + target_branch: gh-pages + # - name: Python setup # uses: actions/setup-python@v4 # with: From 60187056296ac5fd9a9d8d48b79dbed36d66456d Mon Sep 17 00:00:00 2001 From: atteggiani Date: Tue, 7 Nov 2023 14:57:10 +1100 Subject: [PATCH 08/12] test commit/push to gh-pages after removal --- .github/workflows/pr_preview.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index c1135b5ce..cb5c48412 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -59,13 +59,11 @@ jobs: rm -rf $folder - name: Commit to gh-pages - uses: devops-infra/action-commit-push@master - with: - github_token: "${{ secrets.GITHUB_TOKEN }}" - commit_message: "Remove 'pr-preview/pr-${{ github.event.number }}' folder." - force: false - target_branch: gh-pages - + shell: bash + run: | + git commit -m "Remove 'pr-preview/pr-${{ github.event.number }}' folder." + git push origin gh-pages + # - name: Python setup # uses: actions/setup-python@v4 # with: From 65848a081ebc625667417a0fad728fd5fb7e0969 Mon Sep 17 00:00:00 2001 From: atteggiani Date: Tue, 7 Nov 2023 15:02:19 +1100 Subject: [PATCH 09/12] Added git config lines --- .github/workflows/pr_preview.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index cb5c48412..3b65bbc5e 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -61,6 +61,8 @@ jobs: - name: Commit to gh-pages shell: bash run: | + git config user.email "${{ github.action.email }}" + git config user.name "${{ github.action.name }}" git commit -m "Remove 'pr-preview/pr-${{ github.event.number }}' folder." git push origin gh-pages From 1128081bd2da2ec07c5ed4cd49585a305bcf661c Mon Sep 17 00:00:00 2001 From: atteggiani Date: Tue, 7 Nov 2023 15:20:33 +1100 Subject: [PATCH 10/12] Added git config lines --- .github/workflows/pr_preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index 3b65bbc5e..75f015ad7 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -61,8 +61,8 @@ jobs: - name: Commit to gh-pages shell: bash run: | - git config user.email "${{ github.action.email }}" - git config user.name "${{ github.action.name }}" + git config user.name "${{ github.actor }}" + git config user.email "${{ github.actor }}@users.noreply.github.com" git commit -m "Remove 'pr-preview/pr-${{ github.event.number }}' folder." git push origin gh-pages From 61ce89cba639507add1e2acdca58786b2c327e00 Mon Sep 17 00:00:00 2001 From: atteggiani Date: Tue, 7 Nov 2023 15:24:31 +1100 Subject: [PATCH 11/12] t --- .github/workflows/pr_preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index 75f015ad7..03da2d622 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -53,8 +53,8 @@ jobs: folder=pr-preview/pr-${{ github.event.number }} if [ -z $folder ] then - echo "$folder not found!" - exit 1 + echo "Nothing to remove!" + exit 0 fi rm -rf $folder From 28ac4a1cedced94e4a1a9fb3f1f69d34ccd0ba22 Mon Sep 17 00:00:00 2001 From: atteggiani Date: Tue, 7 Nov 2023 15:25:25 +1100 Subject: [PATCH 12/12] tt --- .github/workflows/pr_preview.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr_preview.yml b/.github/workflows/pr_preview.yml index 03da2d622..22ba72e54 100644 --- a/.github/workflows/pr_preview.yml +++ b/.github/workflows/pr_preview.yml @@ -63,6 +63,7 @@ jobs: run: | git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" + git add . git commit -m "Remove 'pr-preview/pr-${{ github.event.number }}' folder." git push origin gh-pages