From edafca17c964d1fd0aa651ea1c3856ab007e0cfe Mon Sep 17 00:00:00 2001 From: Sofia Simdianova Date: Thu, 30 Jul 2026 17:57:47 +0200 Subject: [PATCH 1/2] fix(ci): migrate to namespace runners and fix go-libs/v5 dependency --- .github/actions/env/action.yml | 22 +++++++--------------- .github/workflows/main.yml | 23 ++++++++++------------- go.mod | 4 ++-- go.sum | 8 ++++---- 4 files changed, 23 insertions(+), 34 deletions(-) diff --git a/.github/actions/env/action.yml b/.github/actions/env/action.yml index 3fe5718..9a77152 100644 --- a/.github/actions/env/action.yml +++ b/.github/actions/env/action.yml @@ -7,11 +7,8 @@ inputs: runs: using: composite steps: - - uses: earthly/actions-setup@v1 - with: - github-token: ${{ inputs.token }} - version: "latest" - use-cache: true + - name: Install Nix + uses: cachix/install-nix-action@v31 - name: Login to GitHub Container Registry uses: docker/login-action@v4 with: @@ -22,13 +19,8 @@ runs: uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v4 - - name: "Put back the git branch into git (Earthly uses it for tagging)" - shell: bash - run: | - branch="" - if [ -n "$GITHUB_HEAD_REF" ]; then - branch="$GITHUB_HEAD_REF" - else - branch="${GITHUB_REF##*/}" - fi - git checkout -b "$branch" || true \ No newline at end of file + - uses: namespacelabs/nscloud-cache-action@v1 + with: + path: | + ~/.cache/go-build + /tmp/go/pkg/mod/ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 104e243..ad6ba7d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,9 +25,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} Dirty: - runs-on: "formance-runner" + runs-on: "namespace-profile-linux-amd64-4vcpu" steps: - - uses: 'actions/checkout@v7' + - uses: 'namespacelabs/nscloud-checkout-action@v9' with: fetch-depth: 0 - name: Setup Env @@ -35,8 +35,7 @@ jobs: with: token: ${{ secrets.NUMARY_GITHUB_TOKEN }} - run: > - /nix/var/nix/profiles/default/bin/nix --extra-experimental-features "nix-command" --extra-experimental-features "flakes" - develop --impure --command just pre-commit + nix develop --impure --command just pre-commit env: SPEAKEASY_API_KEY: ${{ secrets.SPEAKEASY_API_KEY }} - name: Get changed files @@ -51,11 +50,11 @@ jobs: fi Tests: - runs-on: "formance-runner" + runs-on: "namespace-profile-linux-amd64-4vcpu" needs: - Dirty steps: - - uses: 'actions/checkout@v7' + - uses: 'namespacelabs/nscloud-checkout-action@v9' with: fetch-depth: 0 - name: Setup Env @@ -63,18 +62,17 @@ jobs: with: token: ${{ secrets.NUMARY_GITHUB_TOKEN }} - run: > - /nix/var/nix/profiles/default/bin/nix --extra-experimental-features "nix-command" --extra-experimental-features "flakes" - develop --impure --command just tests + nix develop --impure --command just tests env: SPEAKEASY_API_KEY: ${{ secrets.SPEAKEASY_API_KEY }} GoReleaser: - runs-on: "formance-runner" + runs-on: "namespace-profile-linux-amd64-4vcpu" if: contains(github.event.pull_request.labels.*.name, 'build-images') || github.ref == 'refs/heads/main' || github.event_name == 'merge_group' needs: - Dirty steps: - - uses: 'actions/checkout@v7' + - uses: 'namespacelabs/nscloud-checkout-action@v9' with: fetch-depth: 0 - name: Setup Env @@ -82,8 +80,7 @@ jobs: with: token: ${{ secrets.NUMARY_GITHUB_TOKEN }} - run: > - /nix/var/nix/profiles/default/bin/nix --extra-experimental-features "nix-command" --extra-experimental-features "flakes" - develop --impure --command just release-ci + nix develop --impure --command just release-ci env: GITHUB_TOKEN: ${{ secrets.NUMARY_GITHUB_TOKEN }} SPEAKEASY_API_KEY: ${{ secrets.SPEAKEASY_API_KEY }} @@ -98,7 +95,7 @@ jobs: - GoReleaser - Tests steps: - - uses: 'actions/checkout@v7' + - uses: 'namespacelabs/nscloud-checkout-action@v9' with: fetch-depth: 0 - name: Setup Env diff --git a/go.mod b/go.mod index 8b2d1f6..51b62cd 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/expr-lang/expr v1.17.7 github.com/formancehq/formance-sdk-go/v3 v3.2.0 github.com/formancehq/go-libs/v3 v3.3.0 - github.com/formancehq/go-libs/v5 v5.1.1-0.20260522083443-d2a60ed2e0dd + github.com/formancehq/go-libs/v5 v5.7.0 github.com/go-chi/chi/v5 v5.2.5 github.com/go-playground/validator/v10 v10.24.0 github.com/google/uuid v1.6.0 @@ -161,7 +161,7 @@ require ( github.com/onsi/gomega v1.39.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.1 // indirect - github.com/opencontainers/runc v1.2.8 // indirect + github.com/opencontainers/runc v1.3.6 // indirect github.com/ory/dockertest/v3 v3.12.0 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect github.com/pierrec/lz4/v4 v4.1.26 // indirect diff --git a/go.sum b/go.sum index 990b9fb..ae9be3a 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/formancehq/formance-sdk-go/v3 v3.2.0 h1:3zxYSu71jjCj5XMBvT6bTm2HlbZWv github.com/formancehq/formance-sdk-go/v3 v3.2.0/go.mod h1:XivkqQzjOtR3W7hqIFYcUN11UIf+X8/V1yoPPnGBQVU= github.com/formancehq/go-libs/v3 v3.3.0 h1:Qs6oPRNHJbR4xu3Lzl2zGAiQD94XLpabAFYPq3YBqK0= github.com/formancehq/go-libs/v3 v3.3.0/go.mod h1:kr5pgap99LPdSVcYWgI+mCN51wr5D+YxEnt9A6JUiFU= -github.com/formancehq/go-libs/v5 v5.1.1-0.20260522083443-d2a60ed2e0dd h1:bXQ9pFcrDoaBFMzAyRNac5EWRuBn//wtQPzl5sXJcvU= -github.com/formancehq/go-libs/v5 v5.1.1-0.20260522083443-d2a60ed2e0dd/go.mod h1:0zJ6yzF4/Pu9lmKpswaEdQChpnxuMFsTxmhTCE1raXk= +github.com/formancehq/go-libs/v5 v5.7.0 h1:2Z2S3vtOJr45tKpofhPqd0qKrPr6KB/LZZ+EfL1PARw= +github.com/formancehq/go-libs/v5 v5.7.0/go.mod h1:+jfCYWJ4Z10NGbhmbfon0hGoLe5pysbVQgePrg8M8W4= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= @@ -349,8 +349,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= -github.com/opencontainers/runc v1.2.8 h1:RnEICeDReapbZ5lZEgHvj7E9Q3Eex9toYmaGBsbvU5Q= -github.com/opencontainers/runc v1.2.8/go.mod h1:cC0YkmZcuvr+rtBZ6T7NBoVbMGNAdLa/21vIElJDOzI= +github.com/opencontainers/runc v1.3.6 h1:SLGIymCtsk80iNPWgbc8dtjI30r+5mTVV+4dN8/17Sk= +github.com/opencontainers/runc v1.3.6/go.mod h1:o1wyv76EDlTkcf0KTFgN8bMWLPvgF/HfX709lDv+rr4= github.com/ory/dockertest/v3 v3.12.0 h1:3oV9d0sDzlSQfHtIaB5k6ghUCVMVLpAY8hwrqoCyRCw= github.com/ory/dockertest/v3 v3.12.0/go.mod h1:aKNDTva3cp8dwOWwb9cWuX84aH5akkxXRvO7KCwWVjE= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= From 7d472254262e0cedb99695ff698a06bd8d0597b3 Mon Sep 17 00:00:00 2001 From: Sofia Simdianova Date: Thu, 30 Jul 2026 18:05:08 +0200 Subject: [PATCH 2/2] fix(ci): migrate to namespace runners and fix go-libs/v5 dependency --- .github/actions/env/action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/env/action.yml b/.github/actions/env/action.yml index 9a77152..e6cef93 100644 --- a/.github/actions/env/action.yml +++ b/.github/actions/env/action.yml @@ -9,6 +9,11 @@ runs: steps: - name: Install Nix uses: cachix/install-nix-action@v31 + - name: Install Earthly + uses: earthly/actions-setup@v1 + with: + github-token: ${{ inputs.token }} + version: "latest" - name: Login to GitHub Container Registry uses: docker/login-action@v4 with: