File tree Expand file tree Collapse file tree
.github/actions/nix-install-ephemeral
ansible/files/admin_api_scripts/pg_upgrade_scripts Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2727 sudo -H aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
2828 sudo -H aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
2929 sudo -H aws configure set aws_session_token $AWS_SESSION_TOKEN
30+ sudo -H aws configure set region ${{ inputs.aws-region }}
3031 sudo mkdir -p /etc/nix
3132 sudo -E python -c "import os; file = open('/etc/nix/nix-secret-key', 'w'); file.write(os.environ['NIX_SIGN_SECRET_KEY']); file.close()"
3233 cat << 'EOF' | sudo tee /etc/nix/upload-to-cache.sh > /dev/null
4243 NIX_SIGN_SECRET_KEY : ${{ env.NIX_SIGN_SECRET_KEY }}
4344 - uses : NixOS/nix-installer-action@d6ef7ecd8f685af89869e5aca0580a33e3e3150c
4445 with :
45- installer-version : 2.33.1
46+ installer-version : 2.33.2
4647 extra-conf : |
4748 substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
4849 trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ extra-experimental-features = nix-command flakes
106106extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com
107107extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=
108108EOF
109- RUN curl -L https://releases.nixos.org/nix/nix-2.33.1 /install | sh -s -- --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf
109+ RUN curl -L https://releases.nixos.org/nix/nix-2.33.2 /install | sh -s -- --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf
110110ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
111111
112112COPY . /nixpg
Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ extra-experimental-features = nix-command flakes
108108extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com
109109extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=
110110EOF
111- RUN curl -L https://releases.nixos.org/nix/nix-2.33.1 /install | sh -s -- --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf
111+ RUN curl -L https://releases.nixos.org/nix/nix-2.33.2 /install | sh -s -- --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf
112112
113113ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
114114
Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ extra-experimental-features = nix-command flakes
108108extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com
109109extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=
110110EOF
111- RUN curl -L https://releases.nixos.org/nix/nix-2.33.1 /install | sh -s -- --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf
111+ RUN curl -L https://releases.nixos.org/nix/nix-2.33.2 /install | sh -s -- --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf
112112
113113ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
114114
Original file line number Diff line number Diff line change @@ -297,7 +297,7 @@ function initiate_upgrade {
297297 --extra-conf " trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
298298 else
299299 echo " 1.1.1. Installing Nix using the official installer"
300- sh <( curl -L https://releases.nixos.org/nix/nix-2.33.1 /install) --yes --daemon --nix-extra-conf-file /dev/stdin << EXTRA_NIX_CONF
300+ sh <( curl -L https://releases.nixos.org/nix/nix-2.33.2 /install) --yes --daemon --nix-extra-conf-file /dev/stdin << EXTRA_NIX_CONF
301301extra-experimental-features = nix-command flakes
302302extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com
303303extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ execute_playbook
8282# ###################
8383
8484function install_nix() {
85- sudo su -c " sh <(curl -L https://releases.nixos.org/nix/nix-2.33.1 /install) --yes --daemon --nix-extra-conf-file /dev/stdin <<EXTRA_NIX_CONF
85+ sudo su -c " sh <(curl -L https://releases.nixos.org/nix/nix-2.33.2 /install) --yes --daemon --nix-extra-conf-file /dev/stdin <<EXTRA_NIX_CONF
8686extra-experimental-features = nix-command flakes
8787extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com
8888extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=
Original file line number Diff line number Diff line change @@ -88,7 +88,7 @@ extra-substituters =
8888Run the following command to install Nix 2.33.1 (the version used in CI) with the custom configuration:
8989
9090``` bash
91- curl -L https://releases.nixos.org/nix/nix-2.33.1 /install | sh -s -- --daemon --yes --nix-extra-conf-file ./nix.conf
91+ curl -L https://releases.nixos.org/nix/nix-2.33.2 /install | sh -s -- --daemon --yes --nix-extra-conf-file ./nix.conf
9292```
9393
9494This will install Nix with our build caches pre-configured, which should eliminate substituter-related errors.
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ function install_packages {
2828
2929
3030function install_nix() {
31- sudo su -c " sh <(curl -L https://releases.nixos.org/nix/nix-2.33.1 /install) --yes --daemon --nix-extra-conf-file /dev/stdin <<EXTRA_NIX_CONF
31+ sudo su -c " sh <(curl -L https://releases.nixos.org/nix/nix-2.33.2 /install) --yes --daemon --nix-extra-conf-file /dev/stdin <<EXTRA_NIX_CONF
3232extra-experimental-features = nix-command flakes
3333extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com
3434extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=
You can’t perform that action at this time.
0 commit comments