Skip to content

Commit 6657d51

Browse files
authored
Fix connector capability generation. Fix goreleaser. (#22)
1 parent 3a803e8 commit 6657d51

File tree

6 files changed

+26
-17
lines changed

6 files changed

+26
-17
lines changed

.github/workflows/capabilities.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ on:
88
jobs:
99
calculate-capabilities:
1010
runs-on: ubuntu-latest
11+
services:
12+
postgres:
13+
image: postgres:16
14+
ports:
15+
- "5432:5432"
16+
env:
17+
POSTGRES_PASSWORD: secretpassword
1118

1219
steps:
1320
- name: Checkout code
@@ -16,14 +23,16 @@ jobs:
1623
token: ${{ secrets.RELENG_GITHUB_TOKEN }}
1724

1825
- name: Setup Go
19-
uses: actions/setup-go@v4
26+
uses: actions/setup-go@v5
2027
with:
2128
go-version-file: 'go.mod'
2229

2330
- name: Build
2431
run: go build -o connector ./cmd/baton-postgresql
2532

2633
- name: Run and save output
34+
env:
35+
BATON_DSN: 'postgres://postgres:secretpassword@localhost:5432/postgres'
2736
run: ./connector capabilities > baton_capabilities.json
2837

2938
- name: Commit changes

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Install Go
8-
uses: actions/setup-go@v4
8+
uses: actions/setup-go@v5
99
with:
1010
go-version: 1.22.x
1111
- name: Checkout code
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
- name: Run linters
1414
uses: golangci/golangci-lint-action@v3
1515
with:
@@ -24,11 +24,11 @@ jobs:
2424
steps:
2525
- name: Install Go
2626
if: success()
27-
uses: actions/setup-go@v4
27+
uses: actions/setup-go@v5
2828
with:
2929
go-version: ${{ matrix.go-version }}
3030
- name: Checkout code
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
- name: go tests
3333
run: go test -v -covermode=count -json ./... > test.json
3434
- name: annotate go tests
@@ -54,11 +54,11 @@ jobs:
5454
CONNECTOR_PRINCIPAL_TYPE: 'role'
5555
steps:
5656
- name: Install Go
57-
uses: actions/setup-go@v4
57+
uses: actions/setup-go@v5
5858
with:
5959
go-version: 1.22.x
6060
- name: Checkout code
61-
uses: actions/checkout@v3
61+
uses: actions/checkout@v4
6262
- name: Install postgres client
6363
run: sudo apt install postgresql-client
6464
# - name: Import sql into postgres

.github/workflows/main.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Install Go
11-
uses: actions/setup-go@v4
11+
uses: actions/setup-go@v5
1212
with:
1313
go-version: 1.22.x
1414
- name: Checkout code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Run linters
1717
uses: golangci/golangci-lint-action@v3
1818
with:
@@ -27,11 +27,11 @@ jobs:
2727
steps:
2828
- name: Install Go
2929
if: success()
30-
uses: actions/setup-go@v4
30+
uses: actions/setup-go@v5
3131
with:
3232
go-version: ${{ matrix.go-version }}
3333
- name: Checkout code
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535
- name: go tests
3636
run: go test -v -covermode=count -json ./... > test.json
3737
- name: annotate go tests

.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: macos-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
1616
- name: Set up Go
17-
uses: actions/setup-go@v4
17+
uses: actions/setup-go@v5
1818
with:
1919
go-version: 1.22.x
2020
- name: Set up Gon
@@ -37,11 +37,11 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: Checkout
40-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
4141
with:
4242
fetch-depth: 0
4343
- name: Set up Go
44-
uses: actions/setup-go@v4
44+
uses: actions/setup-go@v5
4545
with:
4646
go-version: 1.22.x
4747
- name: Docker Login

.gon-arm64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"source": ["./dist/macos-arm64_darwin_arm64/baton-postgresql"],
2+
"source": ["./dist/macos-arm64_darwin_arm64_v8.0/baton-postgresql"],
33
"bundle_id": "com.conductorone.baton.postgresql",
44
"apple_id": {
55
"username" : "[email protected]"

.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ builds:
3636
hooks:
3737
post:
3838
- gon .gon-arm64.json
39-
- mv dist/baton-postgresql-darwin-arm64.signed.zip dist/macos-arm64_darwin_arm64/baton-postgresql
39+
- mv dist/baton-postgresql-darwin-arm64.signed.zip dist/macos-arm64_darwin_arm64_v8.0/baton-postgresql
4040
archives:
4141
- id: linux-archive
4242
builds:

0 commit comments

Comments
 (0)