From 77fae4f6d7bb01a41167d56c3b91f44e1057c566 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 6 Jan 2024 19:37:47 +0000 Subject: [PATCH 01/14] fix(workflow): please bro --- .forgejo/workflows/workflow.yaml | 2 ++ .gitignore | 1 + 2 files changed, 3 insertions(+) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index 66c139e..f812486 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -53,6 +53,8 @@ jobs: release="${{ github.ref }}" fi + echo "github.base_ref = ${{ github.base_ref }}" + echo "github.ref = ${{ github.ref }}" echo "Deploying to Meli on branch $release" npx -p "@getmeli/cli" meli upload ./site \ diff --git a/.gitignore b/.gitignore index 16d3c4d..2b23df4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .cache +.vscode From a725ec10732fb56cf8cdf82168170746c3500b16 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 6 Jan 2024 19:45:10 +0000 Subject: [PATCH 02/14] fix(workflow): set branch variable --- .forgejo/workflows/workflow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index f812486..3c8c384 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -62,6 +62,7 @@ jobs: --site "${{ variables.MELI_SITE }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ --release "$release" + --branch "$release" echo "Deployed to Meli on branch $release" env: From f1f75522e7bd24c231ab9f4199598dfdc65c0e4a Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 6 Jan 2024 19:48:58 +0000 Subject: [PATCH 03/14] fix(workflow): hopefully finally fixed the meli deployment job --- .forgejo/workflows/workflow.yaml | 5 +---- .gitignore | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index 3c8c384..e770d0e 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -52,18 +52,15 @@ jobs: else release="${{ github.ref }}" fi - echo "github.base_ref = ${{ github.base_ref }}" echo "github.ref = ${{ github.ref }}" echo "Deploying to Meli on branch $release" - npx -p "@getmeli/cli" meli upload ./site \ --url "http://pages.coastalcommits.com" \ --site "${{ variables.MELI_SITE }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ - --release "$release" + --release "$GITEA_SHA" \ --branch "$release" - echo "Deployed to Meli on branch $release" env: GITEA_TOKEN: ${{ secrets.COASTALCOMMITSTOKEN }} diff --git a/.gitignore b/.gitignore index 2b23df4..0f14351 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .cache .vscode +site From e004e1de904103d393eb659079c8416986564966 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 6 Jan 2024 19:51:20 +0000 Subject: [PATCH 04/14] fix(workflow): please work bro --- .forgejo/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index e770d0e..492f0a6 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -59,7 +59,7 @@ jobs: --url "http://pages.coastalcommits.com" \ --site "${{ variables.MELI_SITE }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ - --release "$GITEA_SHA" \ + --release "${{ GITEA_SHA }}" \ --branch "$release" echo "Deployed to Meli on branch $release" env: From 9ecfc229e46d1e18ef0303d376719eb38c4ea2bb Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 6 Jan 2024 20:33:47 +0000 Subject: [PATCH 05/14] misc(workflow): added branch name to the release name --- .forgejo/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index 492f0a6..a3bb2d7 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -59,7 +59,7 @@ jobs: --url "http://pages.coastalcommits.com" \ --site "${{ variables.MELI_SITE }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ - --release "${{ GITEA_SHA }}" \ + --release "$release/${{ GITEA_SHA }}" \ --branch "$release" echo "Deployed to Meli on branch $release" env: From e3824ad22af1782744eb80bad537baae06aac128 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 6 Jan 2024 21:59:20 +0000 Subject: [PATCH 06/14] fix(workflow): variables -> vars --- .forgejo/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index a3bb2d7..6a014ff 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -57,7 +57,7 @@ jobs: echo "Deploying to Meli on branch $release" npx -p "@getmeli/cli" meli upload ./site \ --url "http://pages.coastalcommits.com" \ - --site "${{ variables.MELI_SITE }}" \ + --site "${{ vars.MELI_SITE }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ --release "$release/${{ GITEA_SHA }}" \ --branch "$release" From 760ece280a005652fb61d8f9fdd02fbafc13121e Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 6 Jan 2024 22:02:30 +0000 Subject: [PATCH 07/14] misc(workflow): variable name change --- .forgejo/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index 6a014ff..594ff07 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -57,7 +57,7 @@ jobs: echo "Deploying to Meli on branch $release" npx -p "@getmeli/cli" meli upload ./site \ --url "http://pages.coastalcommits.com" \ - --site "${{ vars.MELI_SITE }}" \ + --site "${{ vars.MELI_SITE_ID }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ --release "$release/${{ GITEA_SHA }}" \ --branch "$release" From 9e73029fc21fbce3511b408e550c10aa04e891e6 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 6 Jan 2024 22:04:36 +0000 Subject: [PATCH 08/14] fix(workflow): removing some echos --- .forgejo/workflows/workflow.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index 594ff07..e9d2bda 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -52,15 +52,16 @@ jobs: else release="${{ github.ref }}" fi - echo "github.base_ref = ${{ github.base_ref }}" - echo "github.ref = ${{ github.ref }}" + echo "Deploying to Meli on branch $release" + npx -p "@getmeli/cli" meli upload ./site \ --url "http://pages.coastalcommits.com" \ --site "${{ vars.MELI_SITE_ID }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ --release "$release/${{ GITEA_SHA }}" \ --branch "$release" + echo "Deployed to Meli on branch $release" env: GITEA_TOKEN: ${{ secrets.COASTALCOMMITSTOKEN }} From 66c596a3dac657a3a3f4d516843ca3f91a2bf704 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sun, 7 Jan 2024 01:05:46 +0000 Subject: [PATCH 09/14] fix(workflow): updated documentation deployment url to be https instead of http --- .forgejo/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index e9d2bda..eaa6510 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -56,7 +56,7 @@ jobs: echo "Deploying to Meli on branch $release" npx -p "@getmeli/cli" meli upload ./site \ - --url "http://pages.coastalcommits.com" \ + --url "https://pages.coastalcommits.com" \ --site "${{ vars.MELI_SITE_ID }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ --release "$release/${{ GITEA_SHA }}" \ From c15c6a202574c4dbc88b8ae669489d80965e70c5 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sun, 7 Jan 2024 01:11:56 +0000 Subject: [PATCH 10/14] fix(workflow): maybe fixed deployment? --- .forgejo/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index eaa6510..37f4db4 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -59,7 +59,7 @@ jobs: --url "https://pages.coastalcommits.com" \ --site "${{ vars.MELI_SITE_ID }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ - --release "$release/${{ GITEA_SHA }}" \ + --release "$release/${{ FORGEJO_SHA }}" \ --branch "$release" echo "Deployed to Meli on branch $release" From 87dbcca24097e0922d331a60778374716943979a Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sun, 7 Jan 2024 01:13:27 +0000 Subject: [PATCH 11/14] fix(workflow): please bro --- .forgejo/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index 37f4db4..e14a437 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -59,7 +59,7 @@ jobs: --url "https://pages.coastalcommits.com" \ --site "${{ vars.MELI_SITE_ID }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ - --release "$release/${{ FORGEJO_SHA }}" \ + --release "$release/${{ GITHUB_SHA }}" \ --branch "$release" echo "Deployed to Meli on branch $release" From 3f8aaa290bb0b11d4a42b18927e696f63ef82bb1 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sun, 7 Jan 2024 01:59:04 +0000 Subject: [PATCH 12/14] fix(workflow): fixed deployment finally (i think) --- .forgejo/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index e14a437..88bd12d 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -59,7 +59,7 @@ jobs: --url "https://pages.coastalcommits.com" \ --site "${{ vars.MELI_SITE_ID }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ - --release "$release/${{ GITHUB_SHA }}" \ + --release "$release/$(git rev-parse --short HEAD)" \ --branch "$release" echo "Deployed to Meli on branch $release" From 1b9bed700f5421df3f706b8b4e4119e07100935a Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sun, 7 Jan 2024 02:05:52 +0000 Subject: [PATCH 13/14] fix(workflow): fixed messy documentation deployment --- .forgejo/workflows/workflow.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index 88bd12d..b595249 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -48,9 +48,9 @@ jobs: - name: Deploy the documentation to Meli (CoastalCommits Pages) run: | if [ -n "${{ github.base_ref }}" ]; then - release="${{ github.base_ref }}" + release="$(basename "{{ github.base_ref }}")" else - release="${{ github.ref }}" + release="$(basename "${{ github.ref }}")" fi echo "Deploying to Meli on branch $release" @@ -59,7 +59,7 @@ jobs: --url "https://pages.coastalcommits.com" \ --site "${{ vars.MELI_SITE_ID }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \ - --release "$release/$(git rev-parse --short HEAD)" \ + --release "$release/$(git rev-parse HEAD)" \ --branch "$release" echo "Deployed to Meli on branch $release" From 49d3b9ba0c878968ef19c72ee7ffb8a82a870944 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sun, 7 Jan 2024 02:10:50 +0000 Subject: [PATCH 14/14] fix(workflow): only attempt to comment on the commit if it is a pull request --- .forgejo/workflows/workflow.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index b595249..6ae998e 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -49,6 +49,7 @@ jobs: run: | if [ -n "${{ github.base_ref }}" ]; then release="$(basename "{{ github.base_ref }}")" + export GITEA_TOKEN = ${{ secrets.COASTALCOMMITSTOKEN }} else release="$(basename "${{ github.ref }}")" fi @@ -63,8 +64,6 @@ jobs: --branch "$release" echo "Deployed to Meli on branch $release" - env: - GITEA_TOKEN: ${{ secrets.COASTALCOMMITSTOKEN }} continue-on-error: true - name: Analysing the code with Pylint run: |