diff --git a/.github/workflows/jsonnet-format-check.yaml b/.github/workflows/jsonnet-format-check.yaml index 8742c4195..0a4870477 100644 --- a/.github/workflows/jsonnet-format-check.yaml +++ b/.github/workflows/jsonnet-format-check.yaml @@ -75,9 +75,6 @@ jobs: needs.setup.outputs.has_changes == 'true' ) runs-on: ubuntu-latest - container: - image: docker.io/dysnix/jsonnet:latest - steps: - name: Checkout code uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 @@ -87,6 +84,13 @@ jobs: path: ${{ needs.setup.outputs.checkout_path }} persist-credentials: false + - name: Setup jsonnet + id: setup-jsonnet + uses: zendesk/setup-jsonnet@74119dac8a540c99167a65f14aa1ee99ff143ec2 # v16 + with: + version: v0.22.0 + github_token: ${{ github.token }} + - name: Check Jsonnet formatting id: lint working-directory: ${{ needs.setup.outputs.checkout_path }} diff --git a/.github/workflows/jsonnet-format-fix.yaml b/.github/workflows/jsonnet-format-fix.yaml index decbc3afd..b9bd22c57 100644 --- a/.github/workflows/jsonnet-format-fix.yaml +++ b/.github/workflows/jsonnet-format-fix.yaml @@ -100,15 +100,19 @@ jobs: repository: ${{ needs.setup.outputs.repo }} token: ${{ secrets.WORKFLOW_PAT }} + - name: Setup jsonnet + id: setup-jsonnet + uses: zendesk/setup-jsonnet@74119dac8a540c99167a65f14aa1ee99ff143ec2 # v16 + with: + version: v0.22.0 + github_token: ${{ github.token }} + - name: Apply Jsonnet formatting id: lint env: CHECKOUT_PATH: ${{ needs.setup.outputs.checkout_path }} - # yamllint disable rule:line-length run: | - docker run --rm -v "$GITHUB_WORKSPACE:/work" -w /work --user root docker.io/dysnix/jsonnet:latest \ - sh -c "find \"$CHECKOUT_PATH\" \( -name '*.jsonnet' -o -name '*.libsonnet' \) -print0 | xargs -0 -r jsonnetfmt -i" - # yamllint enable + find "$CHECKOUT_PATH" \( -name '*.jsonnet' -o -name '*.libsonnet' \) -print0 | xargs -0 -r jsonnetfmt -i continue-on-error: true - name: Handle fix commit