Skip to content

Commit

Permalink
Rework github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
bchatelard committed Dec 16, 2023
1 parent 75d8c9d commit 15150b2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ on:
push:
branches:
- main
- develop
tags:
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
pull_request:
branches:
- develop
- main
release:
types: [published]
push:
tags:
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10

jobs:
build-linux:
Expand Down Expand Up @@ -52,7 +50,7 @@ jobs:
run: |
PACK_CMD=./pack make images
- name: Publish images
if: (github.event_name == 'repository_dispatch') || (github.event_name == 'push' && github.ref == 'refs/heads/main')
if: ${{ startsWith(github.ref, 'refs/tags/') }}
run: |
# push heroku 20 and 22
for version in "20" "22"; do
Expand All @@ -74,7 +72,7 @@ jobs:
run: |
PACK_CMD=$PWD/pack make test
- name: Publish beta buildpack
if: (github.event_name == 'push' && github.ref == 'refs/heads/develop')
if: (github.event_name == 'push' && github.ref == 'refs/heads/main')
run: |
# publish builder heroku-20 and flag as beta
docker tag koyeb/builder:heroku-20 koyeb/builder:beta
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
test:
if: github.ref == 'refs/heads/develop'
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest

strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Clone
uses: actions/checkout@v2
with:
ref: refs/heads/develop
ref: refs/heads/main
- name: install yj
run: |
echo "Installing yj to /usr/local/bin"
Expand Down

0 comments on commit 15150b2

Please sign in to comment.