Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
59fe24d
update e2e and unit test to cancel superseded PR runs
clairep94 Oct 28, 2026
2ac28ff
bump actions/checkout and actions/setup-node to v4
clairep94 Oct 28, 2026
753daf2
update deploy.yml to check that 'Test' was success, instead of any co…
clairep94 Oct 28, 2026
f16e099
make sure deploys and staging-deploys run one at a time
clairep94 Oct 28, 2026
773bd29
cache npm install and swap to npm ci
clairep94 Oct 28, 2026
6f4de36
address feedback: put deploy-production and deploy-staging into bucke…
clairep94 Oct 28, 2026
8e36e71
address feedback: use github.run_id to not cancel pushes to develop a…
clairep94 Oct 28, 2026
375d8c0
update e2e and unit test to cancel superseded PR runs
clairep94 Oct 28, 2026
c6a363a
bump actions/checkout and actions/setup-node to v4
clairep94 Oct 28, 2026
ec9527c
update deploy.yml to check that 'Test' was success, instead of any co…
clairep94 Oct 28, 2026
56ff589
make sure deploys and staging-deploys run one at a time
clairep94 Oct 28, 2026
e502c08
cache npm install and swap to npm ci
clairep94 Oct 28, 2026
abd550f
address feedback: put deploy-production and deploy-staging into bucke…
clairep94 Oct 28, 2026
c71980d
address feedback: use github.run_id to not cancel pushes to develop a…
clairep94 Oct 28, 2026
faa377e
Merge branch 'clairep94/test_concurrency' of https://github.com/proce…
clairep94 Oct 30, 2026
0c7c06b
Merge branch 'develop' into clairep94/test_concurrency
clairep94 Oct 30, 2026
ba3cc3b
merge develop
clairep94 Oct 30, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
- develop
types:
- completed
# Run staging deploys one at a time
concurrency:
group: deploy-staging-${{ github.event.workflow_run.conclusion }}
cancel-in-progress: false
env:
PROJECT_ID: ${{ secrets.GKE_PROJECT }}
GKE_CLUSTER: p5-gke-cluster
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
- release
types:
- completed
# Run production deploys one at a time
concurrency:
group: deploy-production-${{ github.event.workflow_run.conclusion }}
cancel-in-progress: false
env:
PROJECT_ID: ${{ secrets.GKE_PROJECT }}
GKE_CLUSTER: p5-gke-cluster
Expand All @@ -14,6 +18,7 @@ env:
IMAGE: ${{ secrets.DOCKER_USERNAME }}/p5.js-web-editor
jobs:
push_to_registry:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
environment: production
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
Expand Down Expand Up @@ -47,7 +52,7 @@ jobs:
with:
service_account_key: ${{ secrets.GKE_SA_KEY }}
project_id: ${{ secrets.GKE_PROJECT }}

# Configure docker to use the gcloud command-line tool as a credential helper
- run: |-
gcloud --quiet auth configure-docker
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ on:
workflow_dispatch:
pull_request:
branches: [develop]

# Cancel superseded PR runs
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
test-e2e:
environment: e2e-tests
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,23 @@ on:
- develop
- release

# Cancel superseded PR runs; let develop/release runs finish since they trigger deploys
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
test:
name: Test and lint code base
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: '18.20.x'
- run: npm install
cache: 'npm'
- run: npm ci
- run: npm run test
- run: npm run typecheck
- run: npm run lint
Loading