Skip to content

Commit

Permalink
ci: reenable workflows that rely on pushes to $default-branch
Browse files Browse the repository at this point in the history
The `$default-branch` macro is not expanded in workflows, only
workflow-templates.  So, unfortunately, we have to hardcode the
`master` branch in the `yml` file to get these to work.
  • Loading branch information
michaelfig committed Dec 2, 2021
1 parent 78ba139 commit a9c70ca
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 39 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ag-solo-xs.yml.DISABLED
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ name: ag-solo on xs
# default

on:
push:
branches: [$default-branch]
pull_request:
branches: [$default-branch]
push:
branches: [ master ] # $default-branch
pull_request:
branches: [ master ] # $default-branch

jobs:
xs-build:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/deployment-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ on:
workflow_dispatch:
# Otherwise, run on default branch.
push:
branches:
- $default-branch
pull_request:
types: [closed]
branches:
- $default-branch
branches: [ master ] # $default-branch

jobs:
deployment-test:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@ name: Build release Docker Images

on:
push:
branches:
- $default-branch
branches: [ master ] # $default-branch
tags:
- "@agoric/sdk@*"
pull_request:
types: [closed]
branches:
- $default-branch

jobs:
docker-deployment:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Integration tests

on:
push:
branches: [$default-branch]
pull_request:
push:
branches: [ master ] # $default-branch
pull_request:

jobs:
# This job is meant to emulate what developers working with the Agoric platform will experience
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: PR Checks
# branches)

on:
pull_request:
pull_request:

jobs:
# Check that commits conform to https://www.conventionalcommits.org/en/v1.0.0/
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/test-all-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ name: Test all Packages

on:
push:
branches: [ $default-branch ]
branches: [ master ] # $default-branch
pull_request:
# Include default types, and also `closed`
# See https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#pull_request
types: [opened, reopened, synchronize, closed]

# set ESM_DISABLE_CACHE=true (will be JSON parsed)
jobs:
Expand Down Expand Up @@ -65,7 +62,7 @@ jobs:
run: yarn lint-check

dev-canary:
if: ${{github.event_name == 'push' || github.event.pull_request.merged == 'true'}}
if: ${{github.event_name == 'push'}}
needs: build
runs-on: ubuntu-latest
strategy:
Expand Down Expand Up @@ -99,7 +96,7 @@ jobs:
matrix:
# note: only use one node-version
node-version: ['14.x']
if: ${{github.event_name == 'push' || github.event.pull_request.merged == 'true'}}
if: ${{github.event_name == 'push'}}
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/restore-node
Expand All @@ -122,7 +119,7 @@ jobs:
matrix:
# note: only use one node-version
node-version: ['14.x']
if: ${{github.event_name == 'push' || github.event.pull_request.merged == 'true'}}
if: ${{github.event_name == 'push' }}
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/restore-node
Expand All @@ -144,7 +141,7 @@ jobs:
- uses: nwtgck/actions-netlify@v1.1
with:
# Production deployment if a push or merged PR.
production-deploy: ${{github.event_name == 'push' || github.event.pull_request.merged == 'true'}}
production-deploy: ${{github.event_name == 'push'}}
publish-dir: coverage/html
# SECURITY: we don't want to hand out the Github token to this action.
# github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-dapp-card-store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Test Dapp Card Store

on:
push:
branches: [ $default-branch ]
branches: [ master ] # $default-branch
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-dapp-fungible-faucet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Test Dapp Fungible Faucet

on:
push:
branches: [ $default-branch ]
branches: [ master ] # $default-branch
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-dapp-oracle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Test Dapp Oracle

on:
push:
branches: [ $default-branch ]
branches: [ master ] # $default-branch
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-dapp-otc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Test Dapp OTC Desk

on:
push:
branches: [ $default-branch ]
branches: [ master ] # $default-branch
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-dapp-pegasus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Test Dapp Pegasus

on:
push:
branches: [ $default-branch ]
branches: [ master ] # $default-branch
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-dapp-simple-exchange.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Test Dapp Simple Exchange

on:
push:
branches: [ $default-branch ]
branches: [ master ] # $default-branch
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-dapp-treasury.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Test Dapp Treasury

on:
push:
branches: [ $default-branch ]
branches: [ master ] # $default-branch
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Test Documentation

on:
push:
branches: [ $default-branch ]
branches: [ master ] # $default-branch
pull_request:

jobs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: Test Golang
# branches)

on:
push:
branches: [ $default-branch ]
pull_request:
push:
branches: [ master ] # $default-branch
pull_request:

# set ESM_DISABLE_CACHE=true (will be JSON parsed)
jobs:
Expand Down

0 comments on commit a9c70ca

Please sign in to comment.