diff --git a/.cirrus.yml b/.cirrus.yml index c610246..0ee75ed 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -13,7 +13,7 @@ linux_task: env: DEBIAN_FRONTEND: noninteractive ASSET_PATTERN: FreeCAD_.*Linux-aarch64 - DEPLOY_RELEASE: 1.0rc4 + DEPLOY_RELEASE: 1.0.0 TARGET_REPO: $CIRRUS_REPO_FULL_NAME # Instructions: diff --git a/.github/workflows/freecad_bundle.yml b/.github/workflows/freecad_bundle.yml index 066e0b7..0208b5e 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, macos-13, ubuntu-latest] - tag: ["1.0rc4"] + tag: ["1.0.0"] include: - os: windows-latest bundle_dir: conda/win diff --git a/.github/workflows/source_creation.yml b/.github/workflows/source_creation.yml index 87c3deb..067a14d 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: ["1.0rc4"] - branch: ["1.0rc4"] + tag: ["1.0.0"] + branch: ["1.0.0"] steps: - name: create source package with submodules and version info diff --git a/conda/linux/create_bundle.sh b/conda/linux/create_bundle.sh index 8ec0ea6..0c3f986 100755 --- a/conda/linux/create_bundle.sh +++ b/conda/linux/create_bundle.sh @@ -9,9 +9,9 @@ conda_env="AppDir/usr" echo -e "\nCreate the environment" mamba create --copy -y -p ${conda_env} \ - -c freecad/label/dev \ + -c freecad \ -c conda-forge \ - freecad=1.0rc4 \ + freecad=1.0.0 \ python=3.11 \ noqt6 \ appimage-updater-bridge \ @@ -95,7 +95,7 @@ find . -name "*.cmake" -type f -delete if [ "$DEPLOY_RELEASE" = "weekly-builds" ]; then export tag="weekly-builds" else - export tag="1.0rc4" # TODO: revert for actual release to "latest" + export tag="latest" fi echo -e "\nCreate the appimage" diff --git a/conda/osx/create_bundle.sh b/conda/osx/create_bundle.sh index 8a5eaa1..0930514 100644 --- a/conda/osx/create_bundle.sh +++ b/conda/osx/create_bundle.sh @@ -3,9 +3,9 @@ export MAMBA_NO_BANNER=1 conda_env="APP/FreeCAD.app/Contents/Resources" -mamba create -y --copy -c freecad/label/dev -c conda-forge -p ${conda_env} \ +mamba create -y --copy -c freecad -c conda-forge -p ${conda_env} \ python=3.11 \ - freecad=1.0rc4 \ + freecad=1.0.0 \ noqt6 \ blas=*=openblas \ blinker \ diff --git a/conda/win/create_bundle.bat b/conda/win/create_bundle.bat index a405613..6695889 100644 --- a/conda/win/create_bundle.bat +++ b/conda/win/create_bundle.bat @@ -5,7 +5,7 @@ mkdir %copy_dir% call mamba create ^ -p %conda_env% ^ - freecad=1.0rc4 ^ + freecad=1.0.0 ^ python=3.11 ^ noqt6 ^ blinker ^ @@ -31,7 +31,7 @@ call mamba create ^ vtk ^ xlutils ^ --copy ^ - -c freecad/label/dev ^ + -c freecad ^ -c conda-forge ^ -y