From f3a7685c4279bac9a6397a48709ebaf382032714 Mon Sep 17 00:00:00 2001 From: MrMeeb Date: Tue, 16 Apr 2024 09:10:29 +0000 Subject: [PATCH 1/4] Change actions GTCR authentication --- .gitea/workflows/build-develop.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-develop.yaml b/.gitea/workflows/build-develop.yaml index 9a7bbf1..ff88305 100644 --- a/.gitea/workflows/build-develop.yaml +++ b/.gitea/workflows/build-develop.yaml @@ -19,8 +19,8 @@ jobs: uses: docker/login-action@v3 with: registry: git.mrmeeb.stream - username: ${{ secrets.GT_USERNAME }} - password: ${{ secrets.GT_TOKEN }} + username: ${{ env.GITHUB_ACTOR }} + password: ${{ secrets.GTCR_TOKEN }} - name: Build and push uses: docker/build-push-action@v5 with: From c1bfeeee603ea17182faec362c7faa03073bbe57 Mon Sep 17 00:00:00 2001 From: MrMeeb Date: Tue, 16 Apr 2024 09:12:46 +0000 Subject: [PATCH 2/4] Change test-pr workflow to always run on amd64 --- .gitea/workflows/test-pr.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test-pr.yaml b/.gitea/workflows/test-pr.yaml index acd63ca..c0e81e1 100644 --- a/.gitea/workflows/test-pr.yaml +++ b/.gitea/workflows/test-pr.yaml @@ -9,7 +9,7 @@ env: jobs: "Build Image": - runs-on: ubuntu-docker-latest + runs-on: [ubuntu-docker-latest, linux/amd64] steps: - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -32,7 +32,7 @@ jobs: username: Gitea avatarUrl: ${{ vars.RUNNER_ICON_URL }} "Notify": - runs-on: ubuntu-docker-latest + runs-on: [ubuntu-docker-latest, linux/amd64] needs: ["Build Image"] steps: - name: Notify of success From ea06fc8b7bcd93ed4758535740129b0d014e98e1 Mon Sep 17 00:00:00 2001 From: MrMeeb Date: Tue, 16 Apr 2024 09:13:13 +0000 Subject: [PATCH 3/4] Change build-develop to always run on amd64 --- .gitea/workflows/build-develop.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-develop.yaml b/.gitea/workflows/build-develop.yaml index ff88305..c622323 100644 --- a/.gitea/workflows/build-develop.yaml +++ b/.gitea/workflows/build-develop.yaml @@ -9,7 +9,7 @@ env: jobs: "Build Image": - runs-on: ubuntu-docker-latest + runs-on: [ubuntu-docker-latest, linux/amd64] steps: - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -39,7 +39,7 @@ jobs: avatarUrl: ${{ vars.RUNNER_ICON_URL }} "Notify": runs-on: ubuntu-docker-latest - needs: ["Build Image"] + runs-on: [ubuntu-docker-latest, linux/amd64] steps: - name: Notify of success uses: rjstone/discord-webhook-notify@v1 From 552d600dbe25f3d778ce76e7e9a6e3d8ed32c0b4 Mon Sep 17 00:00:00 2001 From: MrMeeb Date: Tue, 16 Apr 2024 09:13:41 +0000 Subject: [PATCH 4/4] Correct double runs-on --- .gitea/workflows/build-develop.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/build-develop.yaml b/.gitea/workflows/build-develop.yaml index c622323..bdc247a 100644 --- a/.gitea/workflows/build-develop.yaml +++ b/.gitea/workflows/build-develop.yaml @@ -38,7 +38,6 @@ jobs: username: Gitea avatarUrl: ${{ vars.RUNNER_ICON_URL }} "Notify": - runs-on: ubuntu-docker-latest runs-on: [ubuntu-docker-latest, linux/amd64] steps: - name: Notify of success