From 080c204aed4d5155924d471b8ac2b07fad22acf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Insaurralde=20Avalos?= Date: Sat, 11 Nov 2023 13:53:26 -0300 Subject: [PATCH] 0.21.2 --- .cirrus.yml | 2 +- .github/workflows/freecad_bundle.yml | 2 +- .github/workflows/source_creation.yml | 4 ++-- conda/linux/create_bundle.sh | 4 ++-- conda/osx/create_bundle.sh | 4 ++-- conda/win/create_bundle.bat | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 151e4aad..f63501b7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ env: - DEPLOY_RELEASE: weekly-builds + DEPLOY_RELEASE: 0.21.2 GH_TOKEN: ENCRYPTED[7a45c1bfc23b47bdf2bf67d0e5936e16314c88d0ecc3932c44e7c14df46b763362815f2522305c5c42ce09f35a219b1c] TARGET_REPO: $CIRRUS_REPO_FULL_NAME diff --git a/.github/workflows/freecad_bundle.yml b/.github/workflows/freecad_bundle.yml index e3be85ad..7938d3db 100644 --- a/.github/workflows/freecad_bundle.yml +++ b/.github/workflows/freecad_bundle.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, macos-latest, ubuntu-latest] - tag: ["weekly-builds"] + tag: ["0.21.2"] include: - os: windows-latest bundle_dir: conda/win diff --git a/.github/workflows/source_creation.yml b/.github/workflows/source_creation.yml index 4a689ca9..fe0a24f8 100644 --- a/.github/workflows/source_creation.yml +++ b/.github/workflows/source_creation.yml @@ -14,8 +14,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - tag: ["weekly-builds"] - branch: ["main"] + tag: ["0.21.2"] + branch: ["0.21.2"] steps: - name: Run a multi-line script diff --git a/conda/linux/create_bundle.sh b/conda/linux/create_bundle.sh index fd54ae97..1e0740d9 100755 --- a/conda/linux/create_bundle.sh +++ b/conda/linux/create_bundle.sh @@ -8,7 +8,7 @@ fi conda_env="AppDir/usr" echo -e "\nCreate the environment" -packages="freecad=*.pre occt vtk python=3.10 blas=*=openblas numpy \ +packages="freecad=0.21.2 occt vtk python=3.10 blas=*=openblas numpy \ matplotlib-base scipy sympy pandas six pyyaml pycollada lxml \ xlutils olefile requests blinker opencv qt.py nine docutils" if [[ "$ARCH" = "x86_64" ]]; then @@ -16,7 +16,7 @@ if [[ "$ARCH" = "x86_64" ]]; then fi mamba create -p ${conda_env} ${packages} \ - --copy -c freecad/label/dev -c conda-forge -y + --copy -c freecad -c conda-forge -y mamba run -p ${conda_env} python ../scripts/get_freecad_version.py read -r version_name < bundle_name.txt diff --git a/conda/osx/create_bundle.sh b/conda/osx/create_bundle.sh index 5827feef..236605fe 100644 --- a/conda/osx/create_bundle.sh +++ b/conda/osx/create_bundle.sh @@ -7,12 +7,12 @@ conda_env="APP/FreeCAD.app/Contents/Resources" mamba create \ -p ${conda_env} \ - freecad=*.pre occt vtk python=3.10 calculix blas=*=openblas \ + freecad=0.21.2 occt vtk python=3.10 calculix blas=*=openblas \ numpy matplotlib-base scipy sympy pandas six \ pyyaml jinja2 opencamlib ifcopenshell \ pycollada lxml xlutils olefile requests \ blinker opencv qt.py nine docutils \ - --copy -c freecad/label/dev -c conda-forge -y + --copy -c freecad -c conda-forge -y mamba run -p ${conda_env} python ../scripts/get_freecad_version.py diff --git a/conda/win/create_bundle.bat b/conda/win/create_bundle.bat index cf79275f..124e81a5 100644 --- a/conda/win/create_bundle.bat +++ b/conda/win/create_bundle.bat @@ -5,13 +5,13 @@ mkdir %copy_dir% call mamba create ^ -p %conda_env% ^ - freecad=*.pre python=3.10 occt vtk libredwg calculix gmsh ^ + freecad=0.21.2 python=3.10 occt vtk libredwg calculix gmsh ^ numpy matplotlib-base scipy sympy pandas six ^ pyyaml opencamlib ifcopenshell ^ libredwg pycollada lxml xlutils olefile requests ^ blinker opencv qt.py nine docutils ^ --copy ^ - -c freecad/label/dev ^ + -c freecad ^ -c conda-forge ^ -y