From 47a003c4132a9ec332d04f38bec2a9e4a70d1e3a Mon Sep 17 00:00:00 2001 From: Stevan Freeborn <65925598+StevanFreeborn@users.noreply.github.com> Date: Sun, 28 Jun 2026 21:11:58 -0500 Subject: [PATCH] chore: fix workflows --- .gitea/workflows/deploy.yml | 24 +++++++++++++----------- .gitea/workflows/pull_request.yml | 26 +++++++++++++++++--------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index e46e518..57b8a5a 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -13,36 +13,38 @@ on: jobs: build: name: Build and push Docker image - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-latest outputs: version: ${{ steps.version.outputs.version }} steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: fetch-depth: 0 - name: Login to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v4 - name: Create version tag id: version run: echo "version=$(date +%Y.%m.%d.%H%M%S)" >> $GITHUB_OUTPUT - name: Build and push server image - run: | - TAG=${{ secrets.DOCKERHUB_USERNAME }}/links.stevanfreeborn.com:${{ steps.version.outputs.version }} - docker build -t $TAG . - docker push $TAG + uses: docker/build-push-action@v7 + with: + context: . + platforms: linux/arm64 + push: true + tags: ${{ secrets.DOCKERHUB_USERNAME }}/links.stevanfreeborn.com:${{ steps.version.outputs.version }} deploy: name: Deploy to server runs-on: ubuntu-latest needs: build steps: - - name: Checkout repository - uses: actions/checkout@v6 - with: - fetch-depth: 0 - name: Run deploy script uses: appleboy/ssh-action@master with: diff --git a/.gitea/workflows/pull_request.yml b/.gitea/workflows/pull_request.yml index 9b1d153..f4a666a 100644 --- a/.gitea/workflows/pull_request.yml +++ b/.gitea/workflows/pull_request.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Set up Go uses: actions/setup-go@v6 with: @@ -20,24 +20,32 @@ jobs: version: latest build: name: Build server - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Set up Go uses: actions/setup-go@v6 with: go-version: '1.25' - name: Download dependencies run: go mod download - - name: Build application - run: CGO_ENABLED=0 GOOS=linux go build -o server ./cmd/web/main.go + - name: Build application for ARM64 + run: CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o server ./cmd/web/main.go docker: name: Build Docker image - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v6 - - name: Build Docker image - run: docker build -t links.stevanfreeborn.com . + uses: actions/checkout@v7 + - name: Set up QEMU + uses: docker/setup-qemu-action@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v4 + - name: Build Docker image for ARM64 + uses: docker/build-push-action@v7 + with: + context: . + platforms: linux/arm64 + push: false