Skip to content

Commit c4de136

Browse files
kamilogorekkamilogorek
authored
chore: Remove jq from all github workflows (#2121)
* chore: Remove jq from all github workflows * use nixpkgs#yq-go instead of nixpkgs#yq
1 parent 9aef200 commit c4de136

7 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎.github/actions/build-ami/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ runs:
4545
id: generate-vars
4646
shell: bash
4747
run: |
48-
PG_VERSION=$(nix run nixpkgs#yq -- -r '.postgres_release["postgres${{ inputs.postgres_version }}"]' ansible/vars.yml)
48+
PG_VERSION=$(nix run nixpkgs#yq-go -- -r '.postgres_release["postgres${{ inputs.postgres_version }}"]' ansible/vars.yml)
4949
echo 'postgres-version = "'$PG_VERSION'"' > common-nix.vars.pkr.hcl
5050
echo "" >> common-nix.vars.pkr.hcl
5151
git add -f common-nix.vars.pkr.hcl

‎.github/workflows/ami-release-nix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Set PostgreSQL versions
3232
id: set-versions
3333
run: |
34-
VERSIONS=$(nix run nixpkgs#yq -- -r '.postgres_major[]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
34+
VERSIONS=$(nix run nixpkgs#yq-go -- -o=json -I=0 '.postgres_major' ansible/vars.yml)
3535
echo "postgres_versions=$VERSIONS" >> "$GITHUB_OUTPUT"
3636
3737
build:
@@ -71,7 +71,7 @@ jobs:
7171
7272
- name: Generate common-nix.vars.pkr.hcl
7373
run: |
74-
PG_VERSION="$(nix run nixpkgs#yq -- -r '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)"
74+
PG_VERSION="$(nix run nixpkgs#yq-go -- -r '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)"
7575
echo "postgres-version = \"$PG_VERSION\"" > common-nix.vars.pkr.hcl
7676
7777
- name: Build AMI stage 1

‎.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
permissions:
1111
id-token: write
12-
12+
1313
jobs:
1414
prepare:
1515
runs-on: blacksmith-2vcpu-ubuntu-2404
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set PostgreSQL versions
2525
id: set-versions
2626
run: |
27-
VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
27+
VERSIONS=$(nix run nixpkgs#yq-go -- -o=json -I=0 '.postgres_major' ansible/vars.yml)
2828
echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
2929
3030
publish-staging:
@@ -43,7 +43,7 @@ jobs:
4343
- name: Grab release version
4444
id: process_release_version
4545
run: |
46-
VERSION=$(nix run nixpkgs#yq -- -r '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
46+
VERSION=$(nix run nixpkgs#yq-go -- -r '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
4747
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
4848
echo "major_version=$(echo $VERSION | cut -d'.' -f1)" >> "$GITHUB_OUTPUT"
4949
@@ -91,7 +91,7 @@ jobs:
9191
- name: Grab release version
9292
id: process_release_version
9393
run: |
94-
VERSION=$(nix run nixpkgs#yq -- -r '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
94+
VERSION=$(nix run nixpkgs#yq-go -- -r '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
9595
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
9696
echo "major_version=$(echo $VERSION | cut -d'.' -f1)" >> "$GITHUB_OUTPUT"
9797
@@ -107,7 +107,7 @@ jobs:
107107
with:
108108
role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
109109
aws-region: "us-east-1"
110-
110+
111111
- name: Upload pg_upgrade scripts to s3 prod
112112
run: |
113113
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz

‎.github/workflows/publish-nix-pgupgrade-scripts.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
permissions:
1818
id-token: write
19-
19+
2020
jobs:
2121
prepare:
2222
runs-on: blacksmith-2vcpu-ubuntu-2404
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set PostgreSQL versions
3030
id: set-versions
3131
run: |
32-
VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
32+
VERSIONS=$(nix run nixpkgs#yq-go -- -o=json -I=0 '.postgres_major' ansible/vars.yml)
3333
echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
3434
3535
publish-staging:
@@ -48,7 +48,7 @@ jobs:
4848
- name: Grab release version
4949
id: process_release_version
5050
run: |
51-
VERSION=$(nix run nixpkgs#yq -- -r '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
51+
VERSION=$(nix run nixpkgs#yq-go -- -r '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
5252
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
5353
5454
- name: Create a tarball containing pg_upgrade scripts
@@ -95,7 +95,7 @@ jobs:
9595
- name: Grab release version
9696
id: process_release_version
9797
run: |
98-
VERSION=$(nix run nixpkgs#yq -- -r '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
98+
VERSION=$(nix run nixpkgs#yq-go -- -r '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
9999
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
100100
101101
- name: Create a tarball containing pg_upgrade scripts
@@ -109,7 +109,7 @@ jobs:
109109
with:
110110
role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
111111
aws-region: "us-east-1"
112-
112+
113113
- name: Upload pg_upgrade scripts to s3 prod
114114
run: |
115115
aws s3 cp /tmp/pg_upgrade_scripts.tar.gz "s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/pg_upgrade_scripts.tar.gz"

‎.github/workflows/qemu-image-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set PostgreSQL versions - only builds pg17 atm
3030
id: set-versions
3131
run: |
32-
VERSIONS=$(yq '.postgres_major[1]' ansible/vars.yml | jq -R -s -c 'split("\n")[:-1]')
32+
VERSIONS=$(yq -o=json -I=0 '[.postgres_major[1]]' ansible/vars.yml)
3333
echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
3434
3535
build:

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set PostgreSQL versions
2020
id: set-versions
2121
run: |
22-
VERSIONS=$(nix run nixpkgs#yq -- -r '.postgres_major[]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c "split(\"\n\")[:-1]")
22+
VERSIONS=$(nix run nixpkgs#yq-go -- -o=json -I=0 '.postgres_major' ansible/vars.yml)
2323
echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
2424
build:
2525
needs: prepare
@@ -48,7 +48,7 @@ jobs:
4848
echo "PGMAJOR=$stripped_version" >> $GITHUB_ENV
4949
- name: Generate common-nix.vars.pkr.hcl
5050
run: |
51-
PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
51+
PG_VERSION=$(nix run nixpkgs#yq-go -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
5252
PG_VERSION=$(echo $PG_VERSION | tr -d '"') # Remove any surrounding quotes
5353
echo 'postgres-version = "'$PG_VERSION'"' > common-nix.vars.pkr.hcl
5454
echo "" >> common-nix.vars.pkr.hcl
@@ -57,7 +57,7 @@ jobs:
5757
- name: Generate args
5858
id: args
5959
run: |
60-
ARGS=$(nix run nixpkgs#yq -- 'to_entries | map(select(.value|type == "!!str")) | map(.key + "=" + .value) | join("\n")' ansible/vars.yml)
60+
ARGS=$(nix run nixpkgs#yq-go -- 'to_entries | map(select(.value|type == "!!str")) | map(.key + "=" + .value) | join("\n")' ansible/vars.yml)
6161
echo "result<<EOF" >> $GITHUB_OUTPUT
6262
echo "$ARGS" >> $GITHUB_OUTPUT
6363
echo "EOF" >> $GITHUB_OUTPUT

‎.github/workflows/testinfra-ami-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set PostgreSQL versions
3131
id: set-versions
3232
run: |
33-
VERSIONS=$(nix run nixpkgs#yq -- -r '.postgres_major[]' ansible/vars.yml | nix run nixpkgs#jq -- -R -r -s -c 'split("\n")[:-1]')
33+
VERSIONS=$(nix run nixpkgs#yq-go -- -o=json -I=0 '.postgres_major' ansible/vars.yml)
3434
echo "postgres_versions=$VERSIONS" >> "$GITHUB_OUTPUT"
3535
3636
test-ami-nix:

0 commit comments

Comments
 (0)