From 237a7eb5d33b38db290b2d698e7acda60c11cab1 Mon Sep 17 00:00:00 2001 From: davemfish Date: Wed, 13 Dec 2023 09:11:22 -0500 Subject: [PATCH 1/4] move autotest to near end of job; do not continue-on-error. #1468 --- .github/workflows/build-and-test.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0e25d46fcc..fbe6546deb 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -338,13 +338,6 @@ jobs: - name: Build binaries run: make CONDA="$MAMBA_EXE" binaries - - name: Run invest-autotest with binaries - continue-on-error: true - if : | - github.event_name == 'push' && - (contains(github.ref, 'release') || github.ref == 'refs/heads/main') - run: make invest_autotest - - name: Install Node.js uses: actions/setup-node@v3 with: @@ -460,6 +453,12 @@ jobs: name: ${{ runner.os }}_puppeteer_log.zip' path: ${{ matrix.puppeteer-log }} + - name: Run invest-autotest with binaries + if : | + github.event_name == 'push' && + (contains(github.ref, 'release') || github.ref == 'refs/heads/main') + run: make invest_autotest + - name: Tar the workspace to preserve permissions (macOS) if: failure() && matrix.os == 'macos-latest' run: tar -cvf ${{ matrix.workspace-path}} ${{ github.workspace }} From 8e707e85148789921cbf91362bbd8aba9e85f33f Mon Sep 17 00:00:00 2001 From: davemfish Date: Wed, 13 Dec 2023 09:11:49 -0500 Subject: [PATCH 2/4] temporarily remove the condition on running autotest, so we can see it working now. #1468 --- .github/workflows/build-and-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index fbe6546deb..a6f8673f90 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -454,9 +454,9 @@ jobs: path: ${{ matrix.puppeteer-log }} - name: Run invest-autotest with binaries - if : | - github.event_name == 'push' && - (contains(github.ref, 'release') || github.ref == 'refs/heads/main') + # if : | + # github.event_name == 'push' && + # (contains(github.ref, 'release') || github.ref == 'refs/heads/main') run: make invest_autotest - name: Tar the workspace to preserve permissions (macOS) From 8af4f30cf0c0a0f7ae11c771bd19ace47397f4e9 Mon Sep 17 00:00:00 2001 From: davemfish Date: Wed, 13 Dec 2023 10:18:29 -0500 Subject: [PATCH 3/4] add back the condition for running only on main. #1468 --- .github/workflows/build-and-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 89dcc0a14f..fe2277f38e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -454,9 +454,9 @@ jobs: path: ${{ matrix.puppeteer-log }} - name: Run invest-autotest with binaries - # if : | - # github.event_name == 'push' && - # (contains(github.ref, 'release') || github.ref == 'refs/heads/main') + if : | + github.event_name == 'push' && + (contains(github.ref, 'release') || github.ref == 'refs/heads/main') run: make invest_autotest - name: Tar the workspace to preserve permissions (macOS) From 734695e11bea92342fb9b8ba0d38c1b8d6ff7493 Mon Sep 17 00:00:00 2001 From: davemfish Date: Wed, 13 Dec 2023 10:24:31 -0500 Subject: [PATCH 4/4] make sure autotest only runs on push to release* not autorelease* branches. #1468 --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index fe2277f38e..1489a9182a 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -456,7 +456,7 @@ jobs: - name: Run invest-autotest with binaries if : | github.event_name == 'push' && - (contains(github.ref, 'release') || github.ref == 'refs/heads/main') + (startsWith(github.ref, 'release') || github.ref == 'refs/heads/main') run: make invest_autotest - name: Tar the workspace to preserve permissions (macOS)