Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Github Actions CI #1008

Merged
merged 19 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
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
6 changes: 3 additions & 3 deletions .github/actions/build-linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ runs:
steps:

- name: Install dependencies
uses: nick-invision/retry@v2
uses: nick-fields/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
Expand All @@ -50,7 +50,7 @@ runs:
echo "/usr/lib/ccache" >> $GITHUB_PATH

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
activate-environment: tigl-bld
Expand Down Expand Up @@ -92,7 +92,7 @@ runs:
tar -czf build.tar.gz build

- name: Upload build directory
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.build-artifact }}
path: build.tar.gz
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/build-macos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ runs:
steps:

- name: Install dependencies
uses: nick-invision/retry@v2
uses: nick-fields/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
Expand All @@ -56,7 +56,7 @@ runs:
echo "CXXFLAGS=-fvisibility-inlines-hidden" >> $GITHUB_ENV

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
activate-environment: tigl-bld
Expand Down Expand Up @@ -103,7 +103,7 @@ runs:

- name: Upload package as artifact
if: ${{ inputs.package-artifact }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.package-artifact }}
path: build/*.dmg
Expand All @@ -114,7 +114,7 @@ runs:
gtar -czf build.tar.gz build

- name: Upload build directory
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.build-artifact }}
path: build.tar.gz
Expand Down
10 changes: 5 additions & 5 deletions .github/actions/build-win/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ runs:
steps:

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
activate-environment: tigl-bld
Expand Down Expand Up @@ -114,14 +114,14 @@ runs:

- name: Upload package as artifact
if: ${{ inputs.package-artifact }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.package-artifact }}
path: build/*.zip

- name: Upload installer as artifact
if: ${{ inputs.installer-artifact }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.installer-artifact }}
path: build/*.exe
Expand All @@ -135,7 +135,7 @@ runs:

- name: Upload documentation as artifact
if: ${{ inputs.documentation-artifact }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.documentation-artifact }}
path: build/doc/html/*
Expand All @@ -146,7 +146,7 @@ runs:
tar -czf build.tar.gz build

- name: Upload build directory
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.build-artifact }}
path: build.tar.gz
Expand Down
14 changes: 7 additions & 7 deletions .github/actions/release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ runs:

steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Split Release Description from Changelog
shell: bash -l {0}
Expand All @@ -38,22 +38,22 @@ runs:
github_ref: ${{ github.ref }}

- name: download Win64 package Build artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: win-package

- name: download Win64 installer Build artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: win-installer

- name: download MacOS package Build artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: macos-package

- name: download html-documentation
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: html-documentation
path: html-documentation
Expand All @@ -74,7 +74,7 @@ runs:
macos-package/TIGL-${{ env.version }}-Darwin.dmg

- name: Checkout tigl-website repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: DLR-SC/tigl-website
path: tigl-website
Expand Down Expand Up @@ -111,7 +111,7 @@ runs:
token: ${{ inputs.GH_TOKEN }}

- name: Checkout tigl-conda repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: DLR-SC/tigl-conda
path: tigl-conda
Expand Down
16 changes: 13 additions & 3 deletions .github/actions/test-linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ inputs:
required: false
default: false

codecov_token:
description: 'CodeCov token needed to publish coverage report on codecov'
required: true

unit-tests:
description: "Set to true to run TiGLs unit tests (true or false)"
required: false
Expand All @@ -36,15 +40,15 @@ runs:
sudo apt-get install -y lcov

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
activate-environment: tigl-bld
environment-file: environment.yml
auto-activate-base: false

- name: Download build directory
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ inputs.build-artifact }}

Expand Down Expand Up @@ -77,6 +81,12 @@ runs:

- name: Publish coverage report to codecov.io (ubuntu debug)
if: ${{ inputs.coverage == 'true' }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./build/tests/unittests/coverageReport-unit.info,./build/tests/integrationtests/coverageReport-integration.info
token: ${{ inputs.codecov_token }}
codecov_yml_path: codecov.yml
disable_search: true
verbose: true
flags: unittests

4 changes: 2 additions & 2 deletions .github/actions/test-macos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ runs:
steps:

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
activate-environment: tigl-bld
environment-file: environment.yml
auto-activate-base: false

- name: Download built test directory
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ inputs.build-artifact }}

Expand Down
10 changes: 9 additions & 1 deletion .github/actions/test-win/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,18 @@ runs:
steps:

- name: Download built test directory
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ inputs.build-artifact }}

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
activate-environment: tigl-bld
environment-file: environment.yml
auto-activate-base: false

joergbrech marked this conversation as resolved.
Show resolved Hide resolved
- name: extract build archive
shell: bash
run: |
Expand Down
30 changes: 17 additions & 13 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
GH_TOKEN:
description: 'A Github PAT'
required: true
CODECOV_TOKEN:
description: 'Needed to upload coverage report to codecov'
required: true

inputs:

Expand Down Expand Up @@ -67,15 +70,15 @@ jobs:
strategy:
matrix:
config: ["Debug", "Release"]
os: ["ubuntu-latest", "ubuntu-20.04"]
os: ["ubuntu-latest", "ubuntu-22.04"]
# only enable coverage for Debug build on latest ubuntu
include:
- config: "Debug"
os: "ubuntu-latest"
coverage: "ON"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/build-linux
with:
config: ${{ matrix.config }}
Expand All @@ -90,7 +93,7 @@ jobs:
strategy:
matrix:
config: ["Debug", "Release"]
os: ["ubuntu-latest", "ubuntu-20.04"]
os: ["ubuntu-latest", "ubuntu-22.04"]
unit-tests: [true]
# generate coverage reports on latest ubuntu debug builds
exclude:
Expand All @@ -103,13 +106,14 @@ jobs:
unit-tests: false
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/test-linux
with:
build-artifact: build-${{ matrix.os }}-${{ matrix.config }}-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-${{ matrix.coverage || 'OFF' }}
coverage: ${{ matrix.coverage == 'ON' || false }}
unit-tests: ${{ matrix.unit-tests }}
integration-tests: ${{ inputs.integration-tests == 'true' || false }}
codecov_token: ${{ secrets.CODECOV_TOKEN }}


build-windows:
Expand All @@ -127,7 +131,7 @@ jobs:
installer-artifact: ${{ inputs.win-installer-artifact }}
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/build-win
with:
config: ${{ matrix.config }}
Expand All @@ -154,34 +158,34 @@ jobs:
tigl_bindings_python_internal: "ON"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/test-win
with:
build-artifact: build-${{ matrix.os }}-${{ matrix.config }}-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-OFF-static-${{ matrix.oce_static_libs || 'OFF' }}-python-${{ matrix.tigl_bindings_python_internal || 'OFF' }}
unit-tests: true
integration-tests: ${{ inputs.integration-tests == 'true' }}

build-macos:
runs-on: "macos-latest"
runs-on: "macos-13"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/build-macos
with:
config: "Release"
tigl_nightly: ${{ inputs.tigl_nightly =='true' }}
tigl_concat_generated_files: ${{ inputs.tigl_concat_generated_files == 'true' }}
tigl_enable_coverage: 'OFF'
package-artifact: ${{ inputs.macos-package-artifact }}
build-artifact: build-macos-latest-Release-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-OFF-static-ON-python-OFF
build-artifact: build-macos-13-Release-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-OFF-static-ON-python-OFF

test-macos:
needs: build-macos
runs-on: "macos-latest"
runs-on: "macos-13"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/test-macos
with:
build-artifact: build-macos-latest-Release-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-OFF-static-ON-python-OFF
build-artifact: build-macos-13-Release-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-OFF-static-ON-python-OFF
unit-tests: true
integration-tests: ${{ inputs.integration-tests == 'true' }}

Expand All @@ -190,7 +194,7 @@ jobs:
needs: ["test-macos", "test-windows", "test-linux"]
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/release
with:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
6 changes: 3 additions & 3 deletions bindings/java/build.gradle.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ repositories {
mavenCentral()
}
dependencies {
compile group: 'commons-logging', name: 'commons-logging', version: '1.2'
compile group: 'net.java.dev.jna', name: 'jna', version: '4.1.0'
implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
implementation group: 'net.java.dev.jna', name: 'jna', version: '4.1.0'
}


task prepareWrapper(type: Wrapper) {
gradleVersion = '2.1'
}
}
Binary file modified bindings/java/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions bindings/java/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri Oct 24 09:18:09 CEST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
Loading
Loading