Skip to content

Commit b6b614f

Browse files
committed
fix: change qemu build to oriole
1 parent ca3a691 commit b6b614f

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Diff for: .github/workflows/qemu-image-build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- develop
77
- release/*
8+
- da/fix-qemu-build
89
paths:
910
- '.github/workflows/qemu-image-build.yml'
1011
- 'qemu-arm64-nix.pkr.hcl'
@@ -26,7 +27,7 @@ jobs:
2627
- name: Set PostgreSQL versions - only builds pg17 atm
2728
id: set-versions
2829
run: |
29-
VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[1]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
30+
VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[2]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
3031
echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
3132
3233
build:

Diff for: ansible/tasks/setup-postgres.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
LOCALE_ARCHIVE: /usr/lib/locale/locale-archive
256256
vars:
257257
ansible_command_timeout: 60
258-
when: stage2_nix and is_psql_oriole or is_psql_17
258+
when: stage2_nix and (is_psql_oriole or is_psql_17)
259259

260260
- name: copy PG systemd unit
261261
template:

Diff for: ebssurrogate/scripts/qemu-bootstrap-nix.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ EOF
106106

107107
function clean_legacy_things {
108108
# removes things that are bundled for legacy reasons, but we can start without for our newer artifacts
109-
apt-get unmark zlib1g* # TODO (darora): need to make sure that there aren't other things that still need this
109+
apt-get unhold zlib1g* # TODO (darora): need to make sure that there aren't other things that still need this
110110
apt-get -y purge kong
111111
apt-get autoremove -y
112112
}

0 commit comments

Comments
 (0)