223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'github-actions-improvements' into development

This commit is contained in:
Martin Diehl 2022-11-03 09:50:06 +01:00
parent 5df741c9c2 51da27c853
commit 5c4674104a
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/Fortran.yml vendored
View File

@ -2,7 +2,7 @@ name: Grid and Mesh Solver
on: [push] on: [push]
env: env:
PETSC_VERSION: '3.18.0' PETSC_VERSION: '3.18.1'
HOMEBREW_NO_ANALYTICS: 'ON' # Make Homebrew installation a little quicker HOMEBREW_NO_ANALYTICS: 'ON' # Make Homebrew installation a little quicker
HOMEBREW_NO_AUTO_UPDATE: 'ON' HOMEBREW_NO_AUTO_UPDATE: 'ON'
HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON' HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON'
@ -25,7 +25,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: GCC - Install (Linux) - name: GCC - Install (Linux)
if: contains( matrix.os, 'ubuntu') if: contains( matrix.os, 'ubuntu')
@ -46,7 +46,7 @@ jobs:
- name: PETSc - Cache download - name: PETSc - Cache download
id: petsc-download id: petsc-download
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: download path: download
key: petsc-${{ env.PETSC_VERSION }}.tar.gz key: petsc-${{ env.PETSC_VERSION }}.tar.gz
@ -65,7 +65,7 @@ jobs:
- name: PETSc - Cache installation - name: PETSc - Cache installation
id: petsc-install id: petsc-install
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: petsc-${{ env.PETSC_VERSION }} path: petsc-${{ env.PETSC_VERSION }}
key: petsc-${{ env.PETSC_VERSION }}-${{ matrix.os }}-gcc${{ matrix.gcc_v }}-${{ hashFiles('**/petscversion.h') }} key: petsc-${{ env.PETSC_VERSION }}-${{ matrix.os }}-gcc${{ matrix.gcc_v }}-${{ hashFiles('**/petscversion.h') }}
@ -102,7 +102,7 @@ jobs:
intel: intel:
runs-on: [ubuntu-latest] runs-on: [ubuntu-22.04]
strategy: strategy:
matrix: matrix:
@ -112,7 +112,7 @@ jobs:
INTEL_V: ${{ matrix.intel_v }} INTEL_V: ${{ matrix.intel_v }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Intel - Install - name: Intel - Install
run: | run: |
@ -130,7 +130,7 @@ jobs:
- name: PETSc - Cache download - name: PETSc - Cache download
id: petsc-download id: petsc-download
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: download path: download
key: petsc-${{ env.PETSC_VERSION }}.tar.gz key: petsc-${{ env.PETSC_VERSION }}.tar.gz
@ -143,13 +143,15 @@ jobs:
- name: PETSc - Prepare - name: PETSc - Prepare
run: | run: |
tar -xf download/petsc-${PETSC_VERSION}.tar.gz -C . tar -xf download/petsc-${PETSC_VERSION}.tar.gz -C .
sed -i "1715s/if not os.path.isfile(os.path.join(self.packageDir,'configure')):/if True:/g" \
./petsc-${PETSC_VERSION}/config/BuildSystem/config/package.py
export PETSC_DIR=${PWD}/petsc-${PETSC_VERSION} export PETSC_DIR=${PWD}/petsc-${PETSC_VERSION}
export PETSC_ARCH=intel-${INTEL_V} export PETSC_ARCH=intel-${INTEL_V}
printenv >> $GITHUB_ENV printenv >> $GITHUB_ENV
- name: PETSc - Cache installation - name: PETSc - Cache installation
id: petsc-install id: petsc-install
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: petsc-${{ env.PETSC_VERSION }} path: petsc-${{ env.PETSC_VERSION }}
key: petsc-${{ env.PETSC_VERSION }}-intel-${{ matrix.intel_v }}-${{ hashFiles('**/petscversion.h') }} key: petsc-${{ env.PETSC_VERSION }}-intel-${{ matrix.intel_v }}-${{ hashFiles('**/petscversion.h') }}

8
.github/workflows/Python.yml vendored
View File

@ -9,15 +9,15 @@ jobs:
strategy: strategy:
matrix: matrix:
python-version: ['3.8', '3.9'] #, '3.10'] python-version: ['3.8', '3.9', '3.10']
os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest, macos-latest, windows-latest]
fail-fast: false fail-fast: false
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }} - name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2 uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
@ -63,7 +63,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install pytest - name: Install pytest
run: | run: |