From e6ccc534e7253dec8e87a9a55de6fb554c05a0c3 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Fri, 23 Aug 2024 16:08:48 -0500 Subject: [PATCH 1/3] chore: Add private tests which require auth to merge queue --- .github/workflows/ci-private.yml | 31 +++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 27 +-------------------------- 2 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/ci-private.yml diff --git a/.github/workflows/ci-private.yml b/.github/workflows/ci-private.yml new file mode 100644 index 00000000..483d57fc --- /dev/null +++ b/.github/workflows/ci-private.yml @@ -0,0 +1,31 @@ +name: Continuous integration - private registry + +on: + merge_group: + +jobs: + test-net-private: + name: Test Suite (network-enabled tests) + runs-on: ubuntu-latest + strategy: + matrix: + rust: + - stable + - nightly + - "1.70.0" # MSRV + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Install toolchain + uses: dtolnay/rust-toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + + # - name: Run cargo test (test-net-private) + # run: cargo test --features test-net,test-net-private + # env: + # DOCKER_REGISTRY_QUAY_USER: ${{ secrets.DOCKER_REGISTRY_QUAY_USER }} + # DOCKER_REGISTRY_QUAY_PASSWD: ${{ secrets.DOCKER_REGISTRY_QUAY_PASSWD }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50189e29..37af23c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,7 @@ name: Continuous integration on: pull_request: + merge_group: jobs: check: @@ -56,32 +57,6 @@ jobs: - name: Run tests run: cargo test - test-net-private: - name: Test Suite (network-enabled tests) - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - stable - - nightly - - "1.70.0" # MSRV - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Install toolchain - uses: dtolnay/rust-toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - - # - name: Run cargo test (test-net-private) - # run: cargo test --features test-net,test-net-private - # env: - # DOCKER_REGISTRY_QUAY_USER: ${{ secrets.DOCKER_REGISTRY_QUAY_USER }} - # DOCKER_REGISTRY_QUAY_PASSWD: ${{ secrets.DOCKER_REGISTRY_QUAY_PASSWD }} - lints: name: Lints runs-on: ubuntu-latest From 23711103faf7a60da96e14887bbdca843f4e05a0 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Fri, 23 Aug 2024 16:20:18 -0500 Subject: [PATCH 2/3] chore: Add environment --- .github/workflows/ci-private.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-private.yml b/.github/workflows/ci-private.yml index 483d57fc..8fdf9f0a 100644 --- a/.github/workflows/ci-private.yml +++ b/.github/workflows/ci-private.yml @@ -7,6 +7,7 @@ jobs: test-net-private: name: Test Suite (network-enabled tests) runs-on: ubuntu-latest + environment: main strategy: matrix: rust: From 3deac65c5642de0f8f77492611e70c17b2ede4d4 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Fri, 23 Aug 2024 16:20:50 -0500 Subject: [PATCH 3/3] chore: Add pull-request target to private CI --- .github/workflows/ci-private.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-private.yml b/.github/workflows/ci-private.yml index 8fdf9f0a..78dd2687 100644 --- a/.github/workflows/ci-private.yml +++ b/.github/workflows/ci-private.yml @@ -1,6 +1,7 @@ name: Continuous integration - private registry on: + pull_request: merge_group: jobs: