Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: publish action, wrappers package issue, test of 15.8 image upgrade #1324

Merged
merged 15 commits into from
Nov 25, 2024
Merged

fix: publish action, wrappers package issue, test of 15.8 image upgrade #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
46c7462
fix: publish action
samrose Nov 18, 2024
941242f
chore: cleanup
samrose Nov 18, 2024
e0bb6c8
chore : trigger build on push
samrose Nov 18, 2024
a8c05b0
chore: trigger build
samrose Nov 18, 2024
7acd1ad
fix: correct the var in action
samrose Nov 18, 2024
8ef836f
fix: git should be a nativeBuildInput and not buildInput
samrose Nov 18, 2024
66a3c9f
chore: trigger release and publish
samrose Nov 18, 2024
0a59a23
chore: try to build and cache deps so that nix does not try to fetch …
samrose Nov 18, 2024
1573b21
fix: we can build and cache clickouse-rs this way so as to not fetch it
samrose Nov 18, 2024
b90993f
chore: bump to release to staging
samrose Nov 19, 2024
6d267a1
chore: trugger upgrade script publish
samrose Nov 19, 2024
94c1e21
ichore: trigger release and publish at same time
samrose Nov 19, 2024
6c04830
Merge branch 'develop' into sam/publish-gh-actions
samrose Nov 25, 2024
d937d67
chore: cleanup pr testing lines
samrose Nov 25, 2024
d5ab856
chore: revert for post-pr
samrose Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/publish-nix-pgupgrade-scripts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ jobs:
- name: Grab release version
id: process_release_version
run: |
VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
VERSION=$(echo $PG_VERSION | tr -d '"') # Remove any surrounding quotes
VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
VERSION=$(echo $VERSION | tr -d '"') # Remove any surrounding quotes
if [[ "${{ inputs.postgresVersion }}" != "" ]]; then
VERSION=${{ inputs.postgresVersion }}
fi
Expand Down Expand Up @@ -81,7 +81,6 @@ jobs:
SLACK_COLOR: 'danger'
SLACK_MESSAGE: 'Publishing pg_upgrade scripts failed'
SLACK_FOOTER: ''

publish-prod:
needs: prepare
runs-on: ubuntu-latest
Expand All @@ -95,11 +94,13 @@ jobs:
steps:
- name: Checkout Repo
uses: actions/checkout@v3


- uses: DeterminateSystems/nix-installer-action@main

- name: Grab release version
id: process_release_version
run: |
VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
VERSION=$(echo $PG_VERSION | tr -d '"') # Remove any surrounding quotes
if [[ "${{ inputs.postgresVersion }}" != "" ]]; then
VERSION=${{ inputs.postgresVersion }}
Expand Down
17 changes: 0 additions & 17 deletions ansible/tasks/stage2-setup-postgres.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@
# sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install nixpkgs#openjdk11"
# It was decided to leave pljava disabled at https://github.com/supabase/postgres/pull/690 therefore removing this task

- name: Install Git for Nix package management
become: yes
apt:
name: git
state: present
update_cache: yes
when: stage2_nix

- name: Install Postgres from nix binary cache
become: yes
shell: |
Expand Down Expand Up @@ -42,15 +34,6 @@
shell: |
sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#{{postgresql_version}}_src"
when: stage2_nix

- name: Remove Git after Nix package installations
become: yes
apt:
name: git
state: absent
autoremove: yes
purge: yes
when: stage2_nix

- name: Set ownership and permissions for /etc/ssl/private
become: yes
Expand Down
9 changes: 6 additions & 3 deletions nix/ext/wrappers/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ buildPgrxExtension_0_12_6 rec {
hash = "sha256-CkoNMoh40zbQL4V49ZNYgv3JjoNWjODtTpHn+L8DdZA=";
};

nativeBuildInputs = [ pkg-config cargo ];
buildInputs = [ openssl postgresql git ] ++ lib.optionals (stdenv.isDarwin) [
nativeBuildInputs = [ pkg-config cargo git ];
buildInputs = [ openssl postgresql ] ++ lib.optionals (stdenv.isDarwin) [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
Expand All @@ -52,7 +52,10 @@ buildPgrxExtension_0_12_6 rec {

cargoLock = {
lockFile = "${src}/Cargo.lock";
allowBuiltinFetchGit = true;
allowBuiltinFetchGit = false;
outputHashes = {
"clickhouse-rs-1.1.0-alpha.1" = "sha256-G+v4lNP5eK2U45D1fL90Dq24pUSlpIysNCxuZ17eac0=";
};
};

buildAndTestSubdir = "wrappers";
Expand Down
Loading