Skip to content

Commit

Permalink
updated env
Browse files Browse the repository at this point in the history
  • Loading branch information
lausdahl committed Mar 14, 2024
1 parent 4f2648e commit df85ecb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ env:
PYTHON_VERSION: '3.9.7'
MAVEN_VERSION: 3.8.1
WINDOWS_VERSION: 'windows-2019'
UBUNTU_VERSION: 'ubuntu-22.04'
MACOS_VERSION: 'macos-latest'

MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
Expand All @@ -25,13 +24,13 @@ env:

jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ env.UBUNTU_VERSION , windows-2019, macos-latest ]
os: [ ubuntu-22.04, windows-2019, macos-latest ]

runs-on: ${{ matrix.os }}
steps:

- name: Set up Java
Expand Down Expand Up @@ -95,7 +94,7 @@ jobs:

- name: upload test reports ubuntu
uses: actions/upload-artifact@v2
if: ${{ failure() && matrix.os == env.UBUNTU_VERSION}}
if: ${{ failure() && matrix.os == 'ubuntu-22.04' }}
with:
name: surfire-ubuntu
path: |
Expand Down Expand Up @@ -134,7 +133,7 @@ jobs:

deploy:
needs: build
runs-on: ${{ env.UBUNTU_VERSION }}
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2

Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ env:
PYTHON_VERSION: '3.9.7'
MAVEN_VERSION: 3.8.1
WINDOWS_VERSION: 'windows-2019'
UBUNTU_VERSION: 'ubuntu-22.05'
MACOS_VERSION: 'macos-latest'


Expand All @@ -30,7 +29,7 @@ jobs:

version_change:
name: Create version and tag
runs-on: ${{ env.UBUNTU_VERSION }}
runs-on: ubuntu-latest
outputs:
build_tag: ${{ steps.tagging.outputs.build_tag }} # map step output to job output
build_tag_created: ${{ steps.tagging.outputs.build_tag_created }}
Expand Down Expand Up @@ -104,17 +103,17 @@ jobs:
build:
name: Java and Native Compilation
runs-on: ${{ matrix.os }}
needs: version_change

strategy:
fail-fast: false
matrix:
os: [ ${{ env.UBUNTU_VERSION }}, windows-2019, macos-latest ] # ubuntu-latest, , macos-latest
os: [ ubuntu-22.04, windows-2019, macos-latest ] # ubuntu-latest, , macos-latest
platform: [ x64 ] #x32, x64 ]
exclude:
- os: macos-latest
platform: x32
runs-on: ${{ matrix.os }}
steps:
- name: Set up Java
uses: actions/[email protected]
Expand Down Expand Up @@ -185,7 +184,7 @@ jobs:
final:
name: Build and Deploy Combined Release
runs-on: ${{ env.UBUNTU_VERSION }}
runs-on: ubuntu-22.04

needs: [ version_change , build ]
steps:
Expand Down Expand Up @@ -345,7 +344,7 @@ jobs:

rollback:
name: Rollback on error
runs-on: ${{ env.UBUNTU_VERSION }}
runs-on: ubuntu-latest

needs: [ version_change , build, final ]
if: always() && (needs.version_change.result == 'failure' || needs.build.result == 'failure' || needs.final.result == 'failure')
Expand All @@ -364,7 +363,7 @@ jobs:

cleanup:
name: Update development and master with new release
runs-on: ${{ env.UBUNTU_VERSION }}
runs-on: ubuntu-latest

needs: [ final,version_change ]
steps:
Expand Down

0 comments on commit df85ecb

Please sign in to comment.