From 18b5614e80bd9485669e58748328e14c47447abf Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 13:37:07 -0500 Subject: Test new gh-action --- .github/workflows/update-site.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/update-site.yml (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml new file mode 100644 index 0000000..4dee086 --- /dev/null +++ b/.github/workflows/update-site.yml @@ -0,0 +1,11 @@ +name: update site + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Rename readme file + run: ./screepts/update_site.sh \ No newline at end of file -- cgit v1.2.3 From c1ddb7396e4017dc46133a4f9209f7c4ce979625 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 13:40:58 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index 4dee086..6e7e4f6 100644 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -1,5 +1,7 @@ name: update site +on: workflow_dispatch + jobs: build: runs-on: ubuntu-latest @@ -8,4 +10,4 @@ jobs: - uses: actions/checkout@v2 - name: Rename readme file - run: ./screepts/update_site.sh \ No newline at end of file + run: ./screepts/update_site.sh -- cgit v1.2.3 From 9dbb8b649d13ada7adf696b44fff98f946447c5a Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 13:45:17 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index 6e7e4f6..4cee720 100644 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -10,4 +10,4 @@ jobs: - uses: actions/checkout@v2 - name: Rename readme file - run: ./screepts/update_site.sh + run: ./scripts/update_site.sh -- cgit v1.2.3 From d2c9f70017984e4ff29c4e6bcd6f7a7850ac75f1 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 13:49:55 -0500 Subject: update index --- .github/workflows/update-site.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/workflows/update-site.yml (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml old mode 100644 new mode 100755 -- cgit v1.2.3 From f4a7e3eb5ac10b041a3847db79c3d5e17b86ee2a Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 13:51:24 -0500 Subject: update index --- .github/workflows/update-site.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 .github/workflows/update-site.yml (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml old mode 100755 new mode 100644 -- cgit v1.2.3 From a4b7ebbc494853c319948f4c78660f65bd68647c Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 13:52:45 -0500 Subject: update index --- .github/workflows/update-site.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/workflows/update-site.yml (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml old mode 100644 new mode 100755 -- cgit v1.2.3 From 7240c1a775739e012f8ec730a81bdcf334e01f96 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 14:57:13 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index 4cee720..e7e8b09 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -9,5 +9,18 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Rename readme file - run: ./scripts/update_site.sh + - name: Rename readme files + run: | + ./scripts/update_site.sh + git config --global user.name 'GitHub Action' + git config --global user.email 'action@github.com' + git add ./_widgets + git commit -m "update from master" + git fetch + git checkout gh-pages + git merge master + git checkout master + git reset --hard HEAD~3 # Go back 3 commits. You *will* lose uncommitted work. + git checkout gh-pages + git push origin gh-pages + -- cgit v1.2.3 From a327834155b6c862c3960f1de1fe4095ea609136 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 15:06:31 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index e7e8b09..000efe5 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -9,18 +9,18 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Rename readme files - run: | - ./scripts/update_site.sh + - name: Generate md + run: ./scripts/update_site.sh + + - name: Push to gh-pages branch + run: | git config --global user.name 'GitHub Action' git config --global user.email 'action@github.com' + git stash + git checkout gh-pages + rm -rf ./_widgets + git stash pop git add ./_widgets git commit -m "update from master" - git fetch - git checkout gh-pages - git merge master - git checkout master - git reset --hard HEAD~3 # Go back 3 commits. You *will* lose uncommitted work. - git checkout gh-pages git push origin gh-pages -- cgit v1.2.3 From dd06f29845a6a675e0dd39bea303ec12d5a6fb18 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 15:07:47 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index 000efe5..a2cd7b3 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -17,6 +17,7 @@ jobs: git config --global user.name 'GitHub Action' git config --global user.email 'action@github.com' git stash + git fetch git checkout gh-pages rm -rf ./_widgets git stash pop -- cgit v1.2.3 From 07765a6ff6855af39965c2caad1229d9a2b198c9 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 15:12:33 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index a2cd7b3..ed511d9 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -16,6 +16,7 @@ jobs: run: | git config --global user.name 'GitHub Action' git config --global user.email 'action@github.com' + git add ./_widgets git stash git fetch git checkout gh-pages -- cgit v1.2.3 From 89c135f2622e7afd8cf919488cfb6690e5ea0b88 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 15:15:41 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index ed511d9..67b4020 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -19,9 +19,13 @@ jobs: git add ./_widgets git stash git fetch + echo "git checkout gh-pages" git checkout gh-pages + echo "rm -rf ./_widgets" rm -rf ./_widgets + echo "git stash pop" git stash pop + echo "git add ./_widgets" git add ./_widgets git commit -m "update from master" git push origin gh-pages -- cgit v1.2.3 From 270ee8d7992114c002e546e5c75d8ed50252d35f Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 15:17:32 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index 67b4020..74a47d8 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -23,6 +23,7 @@ jobs: git checkout gh-pages echo "rm -rf ./_widgets" rm -rf ./_widgets + ls -alF echo "git stash pop" git stash pop echo "git add ./_widgets" -- cgit v1.2.3 From 754db7ff0f4d218dae1d329e4c5a18fa6bb669eb Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 19:05:50 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index 74a47d8..3b4d5ee 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -25,7 +25,7 @@ jobs: rm -rf ./_widgets ls -alF echo "git stash pop" - git stash pop + git checkout stash -- . echo "git add ./_widgets" git add ./_widgets git commit -m "update from master" -- cgit v1.2.3 From 2cfdc3f5f502259916205a89a0daa8f633258748 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 19:16:11 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index 3b4d5ee..c95b1d8 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -25,7 +25,7 @@ jobs: rm -rf ./_widgets ls -alF echo "git stash pop" - git checkout stash -- . + git checkout stash -- ./_widgets echo "git add ./_widgets" git add ./_widgets git commit -m "update from master" -- cgit v1.2.3 From d7de3440bf5f7c825843fd43f7dd8a30cba76ce4 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 19:19:49 -0500 Subject: Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1bfeee3..bdb08e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,8 @@ on: push: branches: - '*' + paths: + - '**.lua' pull_request: branches: [ master ] -- cgit v1.2.3 From b1d20df59bec2667972b979535b45f2ca0711f53 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 19:24:03 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index c95b1d8..36db4a8 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -17,17 +17,18 @@ jobs: git config --global user.name 'GitHub Action' git config --global user.email 'action@github.com' git add ./_widgets + git add ./assets git stash git fetch echo "git checkout gh-pages" git checkout gh-pages - echo "rm -rf ./_widgets" rm -rf ./_widgets + rm -rf ./assets ls -alF echo "git stash pop" git checkout stash -- ./_widgets - echo "git add ./_widgets" git add ./_widgets + git add ./assets git commit -m "update from master" git push origin gh-pages -- cgit v1.2.3 From b96ebec107bf16bec52f3f7c40501a2d917766a7 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 19:32:33 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index 36db4a8..974997f 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -17,18 +17,18 @@ jobs: git config --global user.name 'GitHub Action' git config --global user.email 'action@github.com' git add ./_widgets - git add ./assets + git add ./assets/img git stash git fetch echo "git checkout gh-pages" git checkout gh-pages rm -rf ./_widgets - rm -rf ./assets + rm -rf ./assets/img ls -alF echo "git stash pop" git checkout stash -- ./_widgets git add ./_widgets - git add ./assets + git add ./assets/img git commit -m "update from master" git push origin gh-pages -- cgit v1.2.3 From 4066f673dbda4a733ac6d838bf04bff8682265c3 Mon Sep 17 00:00:00 2001 From: streetturtle Date: Sun, 23 Jan 2022 19:37:55 -0500 Subject: Update update-site.yml --- .github/workflows/update-site.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github/workflows') diff --git a/.github/workflows/update-site.yml b/.github/workflows/update-site.yml index 974997f..5cb4ae3 100755 --- a/.github/workflows/update-site.yml +++ b/.github/workflows/update-site.yml @@ -27,6 +27,7 @@ jobs: ls -alF echo "git stash pop" git checkout stash -- ./_widgets + git checkout stash -- ./assets git add ./_widgets git add ./assets/img git commit -m "update from master" -- cgit v1.2.3