diff --git a/.github/workflows/capabilities.yaml b/.github/workflows/capabilities.yaml index de5630b2..e5b6c279 100644 --- a/.github/workflows/capabilities.yaml +++ b/.github/workflows/capabilities.yaml @@ -8,6 +8,13 @@ on: jobs: calculate-capabilities: runs-on: ubuntu-latest + services: + postgres: + image: postgres:16 + ports: + - "5432:5432" + env: + POSTGRES_PASSWORD: secretpassword steps: - name: Checkout code @@ -16,7 +23,7 @@ jobs: token: ${{ secrets.RELENG_GITHUB_TOKEN }} - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: 'go.mod' @@ -24,6 +31,8 @@ jobs: run: go build -o connector ./cmd/baton-postgresql - name: Run and save output + env: + BATON_DSN: 'postgres://postgres:secretpassword@localhost:5432/postgres' run: ./connector capabilities > baton_capabilities.json - name: Commit changes diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d645b266..4e850228 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,11 +5,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.22.x - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run linters uses: golangci/golangci-lint-action@v3 with: @@ -24,11 +24,11 @@ jobs: steps: - name: Install Go if: success() - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: go tests run: go test -v -covermode=count -json ./... > test.json - name: annotate go tests @@ -54,11 +54,11 @@ jobs: CONNECTOR_PRINCIPAL_TYPE: 'role' steps: - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.22.x - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install postgres client run: sudo apt install postgresql-client # - name: Import sql into postgres diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index f5435ee6..b6575e31 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -8,11 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.22.x - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run linters uses: golangci/golangci-lint-action@v3 with: @@ -27,11 +27,11 @@ jobs: steps: - name: Install Go if: success() - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: go tests run: go test -v -covermode=count -json ./... > test.json - name: annotate go tests diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 223924c0..6ee21410 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,11 +10,11 @@ jobs: runs-on: macos-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.22.x - name: Set up Gon @@ -37,11 +37,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.22.x - name: Docker Login diff --git a/.gon-arm64.json b/.gon-arm64.json index 4d500a26..500dd8c3 100644 --- a/.gon-arm64.json +++ b/.gon-arm64.json @@ -1,5 +1,5 @@ { - "source": ["./dist/macos-arm64_darwin_arm64/baton-postgresql"], + "source": ["./dist/macos-arm64_darwin_arm64_v8.0/baton-postgresql"], "bundle_id": "com.conductorone.baton.postgresql", "apple_id": { "username" : "justin.gallardo@conductorone.com" diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 43a47f79..b3761df1 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -36,7 +36,7 @@ builds: hooks: post: - gon .gon-arm64.json - - mv dist/baton-postgresql-darwin-arm64.signed.zip dist/macos-arm64_darwin_arm64/baton-postgresql + - mv dist/baton-postgresql-darwin-arm64.signed.zip dist/macos-arm64_darwin_arm64_v8.0/baton-postgresql archives: - id: linux-archive builds: