Skip to content

Commit

Permalink
Bump github actions and support main branch (#660)
Browse files Browse the repository at this point in the history
  • Loading branch information
labianchin authored Jul 19, 2023
1 parent 75b5670 commit 842d74d
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ on:
# Sequence of patterns matched against refs/heads
branches:
- master # Push events on master branch
- master # Push events on main branch
- 'releases/*' # Push events to branches matching refs/heads/releases/*
- 'refs/tags/*' # Push events to branches matching refs/heads/tags/*
- '!refs/pull/*' # Push events on branches that do not match refs/pull/*
pull_request:
branches:
- master
- main

jobs:
test:
Expand All @@ -22,15 +24,15 @@ jobs:
java_version: ['11', '17']
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.java_version }}
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java_version }}
distribution: 'adopt' # use Corretto once supported https://github.com/actions/setup-java/issues/68
# https://docs.github.com/en/actions/guides/building-and-testing-java-with-maven#caching-dependencies
- name: Cache Maven packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-java${{ matrix.java_version }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -50,15 +52,15 @@ jobs:
- name: End to end tests
run: ./e2e/e2e.sh
- run: mkdir staging && cp /tmp/debeam_e2e.log ./staging
- uses: actions/upload-artifact@v2
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.java_version == '11'
- uses: actions/upload-artifact@v3
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main') && matrix.java_version == '11'
with:
name: Package
path: staging
update_release_draft:
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
# Drafts your next Release notes as Pull Requests are merged into "main"
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -67,22 +69,22 @@ jobs:
name: Deploy
runs-on: 'ubuntu-latest'
needs: [test]
environment: master_env
environment: main_env
permissions:
contents: read
packages: write
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main')
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
# https://docs.github.com/en/actions/guides/building-and-testing-java-with-maven#caching-dependencies
- name: Cache Maven packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2
key: Linux-java11-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: Linux-java11-m2
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt' # use Corretto once supported https://github.com/actions/setup-java/issues/68
Expand Down

0 comments on commit 842d74d

Please sign in to comment.