From 7f3851fb6401879e633c16aaad69d8a466b14506 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Mon, 12 Feb 2024 17:42:21 +0100 Subject: [PATCH] CI: update setup-miniconda to version 3 and checkout to v4 (#12032) Fix condaBasePath when useBundled is false, and there's no pre-existing conda ..other fix and improvements Update sub_buildMacOSCondaIntel.yml Revert updated action checkout to version 4 updated setup-miniconda to version 3 --- .github/workflows/sub_buildMacOSCondaApple.yml | 4 ++-- .github/workflows/sub_buildMacOSCondaIntel.yml | 4 ++-- .github/workflows/sub_buildUbuntu2004.yml | 2 +- .github/workflows/sub_buildUbuntu2204Conda.yml | 4 ++-- .github/workflows/sub_buildWindowsConda.yml | 4 ++-- .github/workflows/sub_lint.yml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sub_buildMacOSCondaApple.yml b/.github/workflows/sub_buildMacOSCondaApple.yml index 58ff621cdb..966ce8c190 100644 --- a/.github/workflows/sub_buildMacOSCondaApple.yml +++ b/.github/workflows/sub_buildMacOSCondaApple.yml @@ -68,11 +68,11 @@ jobs: steps: - name: Checking out source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Setup Miniconda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: activate-environment: .conda/freecad environment-file: conda/conda-env.yaml diff --git a/.github/workflows/sub_buildMacOSCondaIntel.yml b/.github/workflows/sub_buildMacOSCondaIntel.yml index c270f1469c..840a5d9932 100644 --- a/.github/workflows/sub_buildMacOSCondaIntel.yml +++ b/.github/workflows/sub_buildMacOSCondaIntel.yml @@ -68,11 +68,11 @@ jobs: steps: - name: Checking out source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Setup Miniconda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: activate-environment: .conda/freecad environment-file: conda/conda-env.yaml diff --git a/.github/workflows/sub_buildUbuntu2004.yml b/.github/workflows/sub_buildUbuntu2004.yml index e5c4d0c357..5e7a1f9b33 100644 --- a/.github/workflows/sub_buildUbuntu2004.yml +++ b/.github/workflows/sub_buildUbuntu2004.yml @@ -72,7 +72,7 @@ jobs: steps: - name: Checking out source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Install FreeCAD dependencies diff --git a/.github/workflows/sub_buildUbuntu2204Conda.yml b/.github/workflows/sub_buildUbuntu2204Conda.yml index 33d8d32741..0d08113530 100644 --- a/.github/workflows/sub_buildUbuntu2204Conda.yml +++ b/.github/workflows/sub_buildUbuntu2204Conda.yml @@ -66,11 +66,11 @@ jobs: steps: - name: Checking out source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Setup Miniconda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: activate-environment: .conda/freecad environment-file: conda/conda-env.yaml diff --git a/.github/workflows/sub_buildWindowsConda.yml b/.github/workflows/sub_buildWindowsConda.yml index cd5bd8e1a2..8ed42250a4 100644 --- a/.github/workflows/sub_buildWindowsConda.yml +++ b/.github/workflows/sub_buildWindowsConda.yml @@ -61,11 +61,11 @@ jobs: steps: - name: Checking out source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Setup Miniconda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: activate-environment: .conda/freecad environment-file: conda/conda-env.yaml diff --git a/.github/workflows/sub_lint.yml b/.github/workflows/sub_lint.yml index 2c50283f17..a7424dc953 100644 --- a/.github/workflows/sub_lint.yml +++ b/.github/workflows/sub_lint.yml @@ -198,7 +198,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Make needed directories, files and initializations