Skip to content

Commit

Permalink
Merge branch 'slf-113' into slf-113-conductor
Browse files Browse the repository at this point in the history
  • Loading branch information
ianstanton authored Oct 17, 2024
2 parents 778b0c7 + bec192b commit 3c00d5c
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 18 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/cargo-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ jobs:
- name: Cargo format and clippy
run: |
set -xe
sudo apt-get update
sudo apt-get install -y build-essential
cd ${{ matrix.path }}
cargo --version
cargo fmt --all --check
Expand All @@ -88,7 +90,7 @@ jobs:
run: |
set -xe
sudo apt-get update
sudo apt-get install -y pkg-config libssl-dev lsb-release wget
sudo apt-get install -y pkg-config libssl-dev lsb-release wget build-essential
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
wget -qO- https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo tee /etc/apt/trusted.gpg.d/pgdg.asc &>/dev/null
sudo apt-get update && sudo apt-get install -y postgresql-client
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conductor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: |
set -xe
sudo apt-get update
sudo apt-get install -y pkg-config libssl-dev git
sudo apt-get install -y pkg-config libssl-dev git wget build-essential
- uses: azure/setup-helm@v3
- uses: extractions/setup-just@v1
- name: Install kind
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
with:
repository: tembo-io/tembo
path: ./.tembo
ref: 3714d336a0efdfc82234db7ccb708ecf80346e84
ref: 9be38d643b2451325dc98807e190b02d50a96db0
- name: Determine which tags to publish
id: tags
run: |
Expand Down Expand Up @@ -118,4 +118,4 @@ jobs:
ssh_key: ${{ secrets.SERVICE_USER_GITHUB_SSH_KEY }}
branch: ${{ matrix.branch }}
version: ${{ needs.find_directories.outputs.short_sha }}
subdirectory: ${{ matrix.subdirectory }}
subdirectory: ${{ matrix.subdirectory }}
8 changes: 4 additions & 4 deletions .github/workflows/helm-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Lint/Test Helm charts

on:
pull_request:
branches: [ "main" ]
branches: ["main"]
paths:
- 'charts/**'
- "charts/**"

jobs:
find_directories:
Expand All @@ -20,7 +20,7 @@ jobs:
with:
repository: tembo-io/tembo
path: ./.tembo
ref: 84664df742ce9774a3029e08111940f9f1fb345e
ref: 9be38d643b2451325dc98807e190b02d50a96db0
- name: Find directories with Chart.yaml that changed
id: find_directories
uses: ./.tembo/.github/actions/find-changed-directories
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
path: 'code'
path: "code"

- name: Fetch main branch
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: |
set -xe
sudo apt-get update
sudo apt-get install -y pkg-config libssl-dev git
sudo apt-get install -y pkg-config libssl-dev git wget build-essential
- uses: azure/setup-helm@v4
- uses: extractions/setup-just@v2
- name: Install kind
Expand Down
2 changes: 1 addition & 1 deletion conductor/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tembo-stacks/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tembo-stacks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "tembo-stacks"
description = "Tembo Stacks for Postgres"
version = "0.17.1"
version = "0.17.2"
authors = ["tembo.io"]
edition = "2021"
license = "Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions tembo-stacks/src/stacks/specs/analytics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ trunk_installs:
- name: pg_cron
version: 1.6.2
- name: pg_analytics
version: 0.1.4
version: 0.2.1
extensions:
- name: pg_stat_statements
locations:
Expand All @@ -58,4 +58,4 @@ extensions:
locations:
- database: postgres
enabled: true
version: 0.1.2
version: 0.2.1
8 changes: 4 additions & 4 deletions tembo-stacks/src/stacks/specs/paradedb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ trunk_installs:
- name: pg_stat_statements
version: 1.10.0
- name: pg_analytics
version: 0.1.4
version: 0.2.1
- name: pg_search
version: 0.10.3
version: 0.11.0
- name: pg_cron
version: 1.6.2
- name: pgvector
Expand All @@ -50,7 +50,7 @@ extensions:
locations:
- database: postgres
enabled: true
version: 0.10.3
version: 0.11.0
- name: vector
locations:
- database: postgres
Expand All @@ -66,7 +66,7 @@ extensions:
locations:
- database: postgres
enabled: true
version: 0.1.2
version: 0.2.1
- name: pg_ivm
locations:
- database: postgres
Expand Down

0 comments on commit 3c00d5c

Please sign in to comment.