Skip to content

Commit

Permalink
Merge branch 'dev' into setup-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
guillaumemichel authored Dec 12, 2024
2 parents b14af34 + ca0d9f6 commit e0cda83
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_push.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test, Build & Push (dev)
name: Build & Push (dev)

on:
workflow_call:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
name: Test, Build & Push (dev)
name: Pull Request

on:
pull_request:
branches:
- dev
- main

jobs:
test:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/push_dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test, Build & Push (dev)
name: Push (dev)

on:
workflow_dispatch:
Expand All @@ -18,6 +18,7 @@ jobs:
permissions:
id-token: write
contents: read

build_push:
name: Ants
uses: ./.github/workflows/build_push.yml
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/push_main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deployment (prod)
name: Push (prod)

on:
workflow_dispatch:
Expand All @@ -8,22 +8,22 @@ on:

jobs:
test:
name: Ants
name: Deployment
uses: ./.github/workflows/test.yml
permissions:
id-token: write
contents: read

build_push:
name: Ants
name: Deployment
uses: ./.github/workflows/build_push.yml
needs: test
permissions:
id-token: write
contents: read

deploy:
name: Ants
name: Deployment
uses: ./.github/workflows/deploy.yml
needs: build_push
permissions:
Expand Down

0 comments on commit e0cda83

Please sign in to comment.