diff --git a/.github/workflows/capabilities_and_config.yaml b/.github/workflows/capabilities_and_config.yaml index 75d5f330..48ef048e 100644 --- a/.github/workflows/capabilities_and_config.yaml +++ b/.github/workflows/capabilities_and_config.yaml @@ -22,12 +22,18 @@ jobs: go-version-file: "go.mod" - name: Build - run: go build -o connector ./cmd/baton-miro + run: go build -o connector ./cmd/baton-sql - name: Run and save config output run: ./connector config > config_schema.json - name: Run and save capabilities output + env: + DB_USER: example + DB_PASS: example + DB_HOST: example + DB_NAME: example + BATON_CONFIG_PATH: examples/example.yml run: ./connector capabilities > baton_capabilities.json - name: Commit changes diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3798c34e..5104f3da 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,5 +1,10 @@ name: ci -on: pull_request +on: + pull_request: + types: [opened, reopened, synchronize] + push: + branches: + - main jobs: go-lint: runs-on: ubuntu-latest @@ -30,7 +35,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - name: go tests - run: (set -o pipefail && go test -v -covermode=count -json ./... | tee test.json) + run: (set -o pipefail && go test -v -covermode=atomic -json -race ./... | tee test.json) - name: annotate go tests if: always() uses: guyarb/golang-test-annotations@v0.6.0 diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml deleted file mode 100644 index dc0e2dbd..00000000 --- a/.github/workflows/main.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: main ci -on: - push: - branches: - - main -jobs: - go-lint: - runs-on: ubuntu-latest - steps: - - name: Install Go - uses: actions/setup-go@v5 - with: - go-version: 1.23.x - - name: Checkout code - uses: actions/checkout@v4 - - name: Run linters - uses: golangci/golangci-lint-action@v8 - with: - version: latest - args: --timeout=3m - go-test: - strategy: - matrix: - go-version: [1.23.x] - platform: [ubuntu-latest] - runs-on: ${{ matrix.platform }} - steps: - - name: Install Go - if: success() - uses: actions/setup-go@v5 - with: - go-version: ${{ matrix.go-version }} - - name: Checkout code - uses: actions/checkout@v4 - - name: go tests - run: (set -o pipefail && go test -v -covermode=atomic -json -race ./... | tee test.json) - - name: annotate go tests - if: always() - uses: guyarb/golang-test-annotations@v0.6.0 - with: - test-results: test.json diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6e362d0f..b06ddb09 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,6 +10,7 @@ jobs: uses: ConductorOne/github-workflows/.github/workflows/release.yaml@v2 with: tag: ${{ github.ref_name }} + lambda: false secrets: RELENG_GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }} APPLE_SIGNING_KEY_P12: ${{ secrets.APPLE_SIGNING_KEY_P12 }}