From 27e64569841c73176af9dc17218f6478a7004b25 Mon Sep 17 00:00:00 2001 From: Michael Salib Date: Thu, 30 Dec 2021 18:43:19 -0500 Subject: [PATCH 1/2] whee --- .github/workflows/CI.yml | 3 +++ .github/workflows/Release.yml | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3312ffa..bf6f7ab 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -26,6 +26,7 @@ jobs: # anyway so there's no point to run tests a third time. BuildLinux: runs-on: ubuntu-latest + if: "!github.ref == 'refs/heads/main' && github.event_name == 'push'" steps: - uses: actions/checkout@v2 @@ -63,6 +64,7 @@ jobs: BuildWindows: runs-on: windows-latest + if: "!github.ref == 'refs/heads/main' && github.event_name == 'push'" steps: - uses: actions/checkout@v2 @@ -92,6 +94,7 @@ jobs: BuildMacOS: runs-on: macos-latest + if: "!github.ref == 'refs/heads/main' && github.event_name == 'push'" steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index c87f3f0..4f2c08e 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -3,7 +3,6 @@ name: Release on: push: - pull_request: env: CARGO_TERM_COLOR: always @@ -23,7 +22,6 @@ jobs: # bump the version and make a tag. BumpVersion: runs-on: ubuntu-latest - #if: "startsWith(github.ref, 'refs/tags/')" if: github.ref == 'refs/heads/main' && github.event_name == 'push' steps: - uses: actions/checkout@v2 @@ -48,6 +46,7 @@ jobs: # anyway so there's no point to run tests a third time. BuildLinux: runs-on: ubuntu-latest + if: github.ref == 'refs/heads/main' && github.event_name == 'push' needs: [ BumpVersion ] steps: - uses: actions/checkout@v2 @@ -86,6 +85,7 @@ jobs: BuildWindows: runs-on: windows-latest + if: github.ref == 'refs/heads/main' && github.event_name == 'push' needs: [ BumpVersion ] steps: - uses: actions/checkout@v2 @@ -116,6 +116,7 @@ jobs: BuildMacOS: runs-on: macos-latest + if: github.ref == 'refs/heads/main' && github.event_name == 'push' needs: [ BumpVersion ] steps: - uses: actions/checkout@v2 From 39f9df4d683ac348f06cd5b8bd443960a9c3d89c Mon Sep 17 00:00:00 2001 From: Michael Salib Date: Thu, 30 Dec 2021 18:47:01 -0500 Subject: [PATCH 2/2] sigh --- .github/workflows/CI.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bf6f7ab..b872084 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,8 +1,6 @@ name: CI on: - push: - branches: [ main ] pull_request: branches: [ main ] @@ -26,7 +24,6 @@ jobs: # anyway so there's no point to run tests a third time. BuildLinux: runs-on: ubuntu-latest - if: "!github.ref == 'refs/heads/main' && github.event_name == 'push'" steps: - uses: actions/checkout@v2 @@ -64,7 +61,6 @@ jobs: BuildWindows: runs-on: windows-latest - if: "!github.ref == 'refs/heads/main' && github.event_name == 'push'" steps: - uses: actions/checkout@v2 @@ -94,7 +90,6 @@ jobs: BuildMacOS: runs-on: macos-latest - if: "!github.ref == 'refs/heads/main' && github.event_name == 'push'" steps: - uses: actions/checkout@v2