fix: resolve merge conflicts in CI workflow

Resolved conflicts between fix/registry-login-env and origin/main: - Use single-line apt-get install - Use simplified short SHA command - Use 'Build and push image' step name from main All registry login changes preserved (env vars approach).
fix: separate test and build-push jobs (#3 )
2026-09-06 23:40:32 -07:00 · 2026-09-07 06:23:59 +00:00
1 changed files with 3 additions and 7 deletions
@@ -41,18 +41,14 @@ jobs:
    runs-on: golang
    steps:
      - name: Install Node.js and Docker
-        run: |
-          apt-get update
-          apt-get install -y nodejs docker.io
+        run: apt-get update && apt-get install -y nodejs docker.io

      - name: Checkout code
        uses: actions/checkout@v4

      - name: Get short SHA
        id: sha
-        run: |
-          SHORT_SHA=$(git rev-parse --short HEAD)
-          echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
+        run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

      - name: Registry login
        run: |
@@ -62,7 +58,7 @@ jobs:
          REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
          REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}

-      - name: Build Docker image
+      - name: Build and push image
        run: |
          docker build --no-cache \
            -t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \