Skip to content

Commit

Permalink
#764 Fix node20 issues with old OS.
Browse files Browse the repository at this point in the history
Signed-off-by: Gautier Bureau <gautier.bureau@rte-france.com>
  • Loading branch information
gautierbureau committed Jul 10, 2024
1 parent 26751eb commit 1d8dead
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 71 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
DYNAFLOW_LAUNCHER_BUILD_TESTS: "OFF"
steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Fetch Dynawo and Dynawo algorithms
run: |
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
tar xzf openjdk-17.0.2_linux-x64_bin.tar.gz
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Fetch Dynawo and Dynawo algorithms
run: |
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
run: git config --global core.autocrlf input

- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download MS-MPI
shell: bash
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Fetch release script
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/dynawo
sparse-checkout: .github/release.js
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
if: always() && !cancelled() && !failure() && (github.event.action == 'nightly-linux' || (github.event_name == 'workflow_dispatch' && inputs.perform-linux) || !endsWith(github.event_name, '_dispatch'))
name: Linux Fedora (Release, GCC, cxx11)
runs-on: ubuntu-latest
container: dynawo/dynawo-distribution-cxx11:latest
container: dynawo/dynawo-ci-nightly-fedora:latest
needs: nightly
env:
DYNAFLOW_LAUNCHER_BUILD_TYPE: Release
Expand All @@ -74,7 +74,7 @@ jobs:
DYNAFLOW_LAUNCHER_BUILD_TESTS: "OFF"
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Fetch Dynawo's and Dynawo-algorithms's nightly releases
run: |
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
run: du -hs distributions/*

- name: Fetch release script
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/dynawo
sparse-checkout: .github/release.js
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
run: git config --global core.autocrlf input

- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download MS-MPI
shell: bash
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
run: du -hs distrib/*

- name: Fetch release script
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/dynawo
sparse-checkout: .github/release.js
Expand All @@ -251,4 +251,3 @@ jobs:
script: |
const release = require('./dynawo/.github/release.js')
await release({github, context, core, glob})
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Fetch Dynawo
run: |
Expand Down
120 changes: 60 additions & 60 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
if: github.event_name != 'workflow_dispatch' || inputs.perform-linux-cxx11
name: Distribution Linux cxx11
runs-on: ubuntu-latest
container: dynawo/dynawo-distribution-cxx11:latest
container: dynawo/dynawo-ci-nightly-fedora:latest
env:
DYNAFLOW_LAUNCHER_BUILD_TYPE: Release
DYNAFLOW_LAUNCHER_PROCESSORS_USED: 2
Expand All @@ -41,7 +41,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Fetch Dynawo and Dynawo-algorithms
run: |
Expand All @@ -64,7 +64,7 @@ jobs:
zip -r DynaFlowLauncher_Linux_v${version}.zip dynaflow-launcher
- name: Fetch release script
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/dynawo
sparse-checkout: .github/release.js
Expand All @@ -83,61 +83,61 @@ jobs:
const release = require('./dynawo/.github/release.js')
await release({github, context, core, glob})
distribution-centos7:
if: github.event_name != 'workflow_dispatch' || inputs.perform-linux-centos7
name: Distribution Linux centos7
runs-on: ubuntu-latest
container: dynawo/dynawo-distribution-centos7:latest
env:
DYNAFLOW_LAUNCHER_BUILD_TYPE: Release
DYNAFLOW_LAUNCHER_PROCESSORS_USED: 2
DYNAFLOW_LAUNCHER_LOCALE: "en_GB"
DYNAFLOW_LAUNCHER_USE_DOXYGEN: "OFF"
DYNAFLOW_LAUNCHER_BUILD_TESTS: "OFF"

steps:
- name: Checkout sources
uses: actions/checkout@v3

- name: Fetch Dynawo and Dynawo Algorithms
run: |
curl -LOs https://github.com/${{ github.repository_owner }}/dynawo/releases/download/v$DYNAWO_VERSION/Dynawo_Linux_centos7_v$DYNAWO_VERSION.zip
curl -LOs https://github.com/${{ github.repository_owner }}/dynawo-algorithms/releases/download/v$DYNAWO_VERSION/DynawoAlgorithms_Linux_headers_centos7_v$DYNAWO_VERSION.zip
- name: Unzip Dynawo and Dynawo algorithms
run: |
unzip -qq "Dynawo_Linux_centos7_v${DYNAWO_VERSION}.zip"
unzip -qq "DynawoAlgorithms_Linux_headers_centos7_v${DYNAWO_VERSION}.zip"
- name: Build
run: |
export DYNAWO_HOME=$(pwd)/dynawo
export DYNAWO_ALGORITHMS_HOME=$(pwd)/dynawo-algorithms
export DYNAFLOW_LAUNCHER_HOME=$(pwd)
export DYNAFLOW_LAUNCHER_INSTALL_DIR=$DYNAFLOW_LAUNCHER_HOME/dynaflow-launcher
scripts/envDFL.sh build-user
version=$(scripts/envDFL.sh version 2>&1 | cut -f1 -d' ')
zip -r DynaFlowLauncher_Linux_centos7_v${version}.zip dynaflow-launcher
- name: Fetch release script
uses: actions/checkout@v3
with:
repository: ${{ github.repository_owner }}/dynawo
sparse-checkout: .github/release.js
sparse-checkout-cone-mode: false
path: dynawo

- name: Upload assets
uses: actions/github-script@v6
env:
release_id: ${{ github.event_name != 'workflow_dispatch' && github.event.release.id || inputs.release-id }}
files: |
DynaFlowLauncher_*.zip
with:
retries: 3
script: |
const release = require('./dynawo/.github/release.js')
await release({github, context, core, glob})
# distribution-centos7:
# if: github.event_name != 'workflow_dispatch' || inputs.perform-linux-centos7
# name: Distribution Linux centos7
# runs-on: ubuntu-latest
# container: dynawo/dynawo-distribution-centos7:latest
# env:
# DYNAFLOW_LAUNCHER_BUILD_TYPE: Release
# DYNAFLOW_LAUNCHER_PROCESSORS_USED: 2
# DYNAFLOW_LAUNCHER_LOCALE: "en_GB"
# DYNAFLOW_LAUNCHER_USE_DOXYGEN: "OFF"
# DYNAFLOW_LAUNCHER_BUILD_TESTS: "OFF"
#
# steps:
# - name: Checkout sources
# uses: actions/checkout@v4
#
# - name: Fetch Dynawo and Dynawo Algorithms
# run: |
# curl -LOs https://github.com/${{ github.repository_owner }}/dynawo/releases/download/v$DYNAWO_VERSION/Dynawo_Linux_centos7_v$DYNAWO_VERSION.zip
# curl -LOs https://github.com/${{ github.repository_owner }}/dynawo-algorithms/releases/download/v$DYNAWO_VERSION/DynawoAlgorithms_Linux_headers_centos7_v$DYNAWO_VERSION.zip
#
# - name: Unzip Dynawo and Dynawo algorithms
# run: |
# unzip -qq "Dynawo_Linux_centos7_v${DYNAWO_VERSION}.zip"
# unzip -qq "DynawoAlgorithms_Linux_headers_centos7_v${DYNAWO_VERSION}.zip"
#
# - name: Build
# run: |
# export DYNAWO_HOME=$(pwd)/dynawo
# export DYNAWO_ALGORITHMS_HOME=$(pwd)/dynawo-algorithms
# export DYNAFLOW_LAUNCHER_HOME=$(pwd)
# export DYNAFLOW_LAUNCHER_INSTALL_DIR=$DYNAFLOW_LAUNCHER_HOME/dynaflow-launcher
# scripts/envDFL.sh build-user
# version=$(scripts/envDFL.sh version 2>&1 | cut -f1 -d' ')
# zip -r DynaFlowLauncher_Linux_centos7_v${version}.zip dynaflow-launcher
#
# - name: Fetch release script
# uses: actions/checkout@v4
# with:
# repository: ${{ github.repository_owner }}/dynawo
# sparse-checkout: .github/release.js
# sparse-checkout-cone-mode: false
# path: dynawo
#
# - name: Upload assets
# uses: actions/github-script@v6
# env:
# release_id: ${{ github.event_name != 'workflow_dispatch' && github.event.release.id || inputs.release-id }}
# files: |
# DynaFlowLauncher_*.zip
# with:
# retries: 3
# script: |
# const release = require('./dynawo/.github/release.js')
# await release({github, context, core, glob})

distribution-windows:
if: github.event_name != 'workflow_dispatch' || inputs.perform-windows
Expand All @@ -149,7 +149,7 @@ jobs:
run: git config --global core.autocrlf input

- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download MS-MPI
shell: bash
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
7z a DynaFlowLauncher_Windows_v%DYNAWO_VERSION%.zip dynaflow-launcher
- name: Fetch release script
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/dynawo
sparse-checkout: .github/release.js
Expand Down

0 comments on commit 1d8dead

Please sign in to comment.