diff --git a/.github/workflows/backend-linter.yml b/.github/workflows/backend-linter.yml index 4aea4bcd..b66aa005 100644 --- a/.github/workflows/backend-linter.yml +++ b/.github/workflows/backend-linter.yml @@ -24,10 +24,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version-file: backend/go.mod diff --git a/.github/workflows/build-next.yml b/.github/workflows/build-next.yml index 9ed7636d..403ca5bf 100644 --- a/.github/workflows/build-next.yml +++ b/.github/workflows/build-next.yml @@ -19,22 +19,20 @@ jobs: attestations: write steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup pnpm uses: pnpm/action-setup@v4 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: 22 - cache: 'pnpm' - cache-dependency-path: pnpm-lock.yaml - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: - go-version-file: 'backend/go.mod' + go-version-file: "backend/go.mod" - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -74,7 +72,7 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: ${{ env.DOCKER_IMAGE_NAME }}:next - file: Dockerfile-prebuilt + file: docker/Dockerfile-prebuilt - name: Build and push container image (distroless) uses: docker/build-push-action@v6 id: container-build-push-distroless @@ -83,16 +81,16 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: ${{ env.DOCKER_IMAGE_NAME }}:next-distroless - file: Dockerfile-distroless + file: docker/Dockerfile-distroless - name: Container image attestation uses: actions/attest-build-provenance@v2 with: - subject-name: '${{ env.DOCKER_IMAGE_NAME }}' + subject-name: "${{ env.DOCKER_IMAGE_NAME }}" subject-digest: ${{ steps.build-push-image.outputs.digest }} push-to-registry: true - name: Container image attestation (distroless) uses: actions/attest-build-provenance@v2 with: - subject-name: '${{ env.DOCKER_IMAGE_NAME }}' + subject-name: "${{ env.DOCKER_IMAGE_NAME }}" subject-digest: ${{ steps.container-build-push-distroless.outputs.digest }} push-to-registry: true diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 351ffd74..e37fdf88 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -3,15 +3,15 @@ on: push: branches: [main] paths-ignore: - - 'docs/**' - - '**.md' - - '.github/**' + - "docs/**" + - "**.md" + - ".github/**" pull_request: branches: [main] paths-ignore: - - 'docs/**' - - '**.md' - - '.github/**' + - "docs/**" + - "**.md" + - ".github/**" jobs: build: @@ -22,7 +22,7 @@ jobs: actions: write runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -30,6 +30,8 @@ jobs: - name: Build and export uses: docker/build-push-action@v6 with: + context: . + file: docker/Dockerfile push: false load: false tags: pocket-id:test @@ -57,16 +59,15 @@ jobs: matrix: db: [sqlite, postgres] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Setup pnpm uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 + - name: Setup Node.js + uses: actions/setup-node@v5 with: node-version: 22 - cache: 'pnpm' - cache-dependency-path: pnpm-lock.yaml - name: Cache Playwright Browsers uses: actions/cache@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9011c37b..062a5208 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: tags: - - 'v*.*.*' + - "v*.*.*" jobs: build: @@ -19,14 +19,12 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v4 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: 22 - cache: 'pnpm' - cache-dependency-path: pnpm-lock.yaml - - uses: actions/setup-go@v5 + - uses: actions/setup-go@v6 with: - go-version-file: 'backend/go.mod' + go-version-file: "backend/go.mod" - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx @@ -81,7 +79,7 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - file: Dockerfile-prebuilt + file: docker/Dockerfile-prebuilt - name: Build and push container image (distroless) uses: docker/build-push-action@v6 id: container-build-push-distroless @@ -91,21 +89,21 @@ jobs: push: true tags: ${{ steps.meta-distroless.outputs.tags }} labels: ${{ steps.meta-distroless.outputs.labels }} - file: Dockerfile-distroless + file: docker/Dockerfile-distroless - name: Binary attestation uses: actions/attest-build-provenance@v2 with: - subject-path: 'backend/.bin/pocket-id-**' + subject-path: "backend/.bin/pocket-id-**" - name: Container image attestation uses: actions/attest-build-provenance@v2 with: - subject-name: '${{ env.DOCKER_IMAGE_NAME }}' + subject-name: "${{ env.DOCKER_IMAGE_NAME }}" subject-digest: ${{ steps.container-build-push.outputs.digest }} push-to-registry: true - name: Container image attestation (distroless) uses: actions/attest-build-provenance@v2 with: - subject-name: '${{ env.DOCKER_IMAGE_NAME }}' + subject-name: "${{ env.DOCKER_IMAGE_NAME }}" subject-digest: ${{ steps.container-build-push-distroless.outputs.digest }} push-to-registry: true - name: Upload binaries to release @@ -122,6 +120,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Mark release as published run: gh release edit ${{ github.ref_name }} --draft=false diff --git a/.github/workflows/svelte-check.yml b/.github/workflows/svelte-check.yml index 56418958..b49deddc 100644 --- a/.github/workflows/svelte-check.yml +++ b/.github/workflows/svelte-check.yml @@ -4,21 +4,21 @@ on: push: branches: [main] paths: - - 'frontend/src/**' - - '.github/svelte-check-matcher.json' - - 'frontend/package.json' - - 'frontend/package-lock.json' - - 'frontend/tsconfig.json' - - 'frontend/svelte.config.js' + - "frontend/src/**" + - ".github/svelte-check-matcher.json" + - "frontend/package.json" + - "frontend/package-lock.json" + - "frontend/tsconfig.json" + - "frontend/svelte.config.js" pull_request: branches: [main] paths: - - 'frontend/src/**' - - '.github/svelte-check-matcher.json' - - 'frontend/package.json' - - 'frontend/package-lock.json' - - 'frontend/tsconfig.json' - - 'frontend/svelte.config.js' + - "frontend/src/**" + - ".github/svelte-check-matcher.json" + - "frontend/package.json" + - "frontend/package-lock.json" + - "frontend/tsconfig.json" + - "frontend/svelte.config.js" workflow_dispatch: jobs: @@ -34,17 +34,15 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup pnpm uses: pnpm/action-setup@v4 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: 22 - cache: 'pnpm' - cache-dependency-path: pnpm-lock.yaml - name: Install dependencies run: pnpm --filter pocket-id-frontend install --frozen-lockfile diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index c5a618dd..ca2b36a0 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -16,8 +16,8 @@ jobs: actions: write runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 + - uses: actions/checkout@v5 + - uses: actions/setup-go@v6 with: go-version-file: "backend/go.mod" cache-dependency-path: "backend/go.sum" diff --git a/.github/workflows/update-aaguids.yml b/.github/workflows/update-aaguids.yml index b816034c..18778b05 100644 --- a/.github/workflows/update-aaguids.yml +++ b/.github/workflows/update-aaguids.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Fetch JSON data run: | diff --git a/Dockerfile b/docker/Dockerfile similarity index 100% rename from Dockerfile rename to docker/Dockerfile diff --git a/Dockerfile-distroless b/docker/Dockerfile-distroless similarity index 100% rename from Dockerfile-distroless rename to docker/Dockerfile-distroless diff --git a/Dockerfile-prebuilt b/docker/Dockerfile-prebuilt similarity index 100% rename from Dockerfile-prebuilt rename to docker/Dockerfile-prebuilt diff --git a/scripts/development/deploy-development-image.sh b/scripts/development/deploy-development-image.sh index bf07256d..ffe785e2 100755 --- a/scripts/development/deploy-development-image.sh +++ b/scripts/development/deploy-development-image.sh @@ -1 +1 @@ -docker buildx build --push --tag ghcr.io/pocket-id/pocket-id:development --platform linux/amd64,linux/arm64 . \ No newline at end of file +docker buildx build --push --file docker/Dockerfile --tag ghcr.io/pocket-id/pocket-id:development --platform linux/amd64,linux/arm64 . \ No newline at end of file