From d4c9c722c52e28a07c80ea12408df00f3c63b8f7 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Tue, 23 Jan 2024 13:49:56 +0100 Subject: [PATCH 01/14] Update checkout action --- .github/workflows/build_all.yaml | 2 +- .github/workflows/build_recipes.yaml | 2 +- .github/workflows/build_simple.yaml | 2 +- .github/workflows/new_versions.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_all.yaml b/.github/workflows/build_all.yaml index f6ac9cf0c..29517bc00 100644 --- a/.github/workflows/build_all.yaml +++ b/.github/workflows/build_all.yaml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/build_recipes.yaml b/.github/workflows/build_recipes.yaml index 84afc74a7..78ec082d4 100644 --- a/.github/workflows/build_recipes.yaml +++ b/.github/workflows/build_recipes.yaml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/build_simple.yaml b/.github/workflows/build_simple.yaml index eaf20d90b..57fe433e0 100644 --- a/.github/workflows/build_simple.yaml +++ b/.github/workflows/build_simple.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/new_versions.yaml b/.github/workflows/new_versions.yaml index 28456b17c..0f1f3c46c 100644 --- a/.github/workflows/new_versions.yaml +++ b/.github/workflows/new_versions.yaml @@ -9,7 +9,7 @@ jobs: update_versions: runs-on: [ubuntu-latest] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: install mamba uses: mamba-org/provision-with-micromamba@main From d3b1de398a402256f2ec3af393674f4caee1433f Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Tue, 23 Jan 2024 17:03:54 +0100 Subject: [PATCH 02/14] Update micromamba setup --- .github/workflows/new_versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/new_versions.yaml b/.github/workflows/new_versions.yaml index 0f1f3c46c..837e926c1 100644 --- a/.github/workflows/new_versions.yaml +++ b/.github/workflows/new_versions.yaml @@ -11,8 +11,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install mamba - uses: mamba-org/provision-with-micromamba@main + - name: Install micromamba + uses: mamba-org/setup-micromamba@v1 with: environment-file: tickbot.yml From 4995682af5d61c0b184730afd85ecb6ddfa4a9bb Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Tue, 23 Jan 2024 17:35:09 +0100 Subject: [PATCH 03/14] Clean up --- .github/workflows/build_all.yaml | 53 ++++++++--------- .github/workflows/build_recipes.yaml | 87 ++++++++++++---------------- .github/workflows/build_simple.yaml | 50 ++++++++-------- 3 files changed, 82 insertions(+), 108 deletions(-) diff --git a/.github/workflows/build_all.yaml b/.github/workflows/build_all.yaml index 29517bc00..c4f30611a 100644 --- a/.github/workflows/build_all.yaml +++ b/.github/workflows/build_all.yaml @@ -16,76 +16,69 @@ jobs: emsdk_ver: ["3.1.45"] steps: - + ################################################################ + # SETUP + ################################################################ - name: Checkout repo uses: actions/checkout@v4 with: fetch-depth: 0 - - name: delete fortran... - run: | - sudo apt-get remove gfortran -y + - name: Delete fortran + run: sudo apt-get remove gfortran -y ################################################################ # CONFIG ################################################################ - - name: global config + - name: Global config shell: bash -el {0} - run: | - git config --global advice.detachedHead false - cp $GITHUB_WORKSPACE/.github/workflows/.condarc $HOME/.condarc - cp $GITHUB_WORKSPACE/conda_build_config.yaml $HOME + run: git config --global advice.detachedHead false ################################################################ # MAMBA ################################################################ - - uses: mamba-org/setup-micromamba@v1 + - name: Install micromamba + uses: mamba-org/setup-micromamba@v1 with: environment-file: ci_env.yml - environment-name: ci - init-shell: >- - bash + init-shell: bash cache-environment: true post-cleanup: 'all' ################################################################ # POST ENV INSTALL CONFIG ################################################################ - - name: post env install config + - name: Post env install config shell: bash -el {0} run: | - cp $GITHUB_WORKSPACE/.github/workflows/.condarc $HOME/.condarc + cp $GITHUB_WORKSPACE/.github/workflows/.condarc $HOME + cp $GITHUB_WORKSPACE/conda_build_config.yaml $HOME playwright install ################################################################ - # setup emsdk + # EMSDK ################################################################ - - name: "setup emsdk" + - name: Setup emsdk shell: bash -el {0} run: | - ./emsdk/setup_emsdk.sh ${{ matrix.emsdk_ver }} $(pwd)/emsdk_install - - + ./emsdk/setup_emsdk.sh ${{ matrix.emsdk_ver }} $(pwd)/emsdk_install ################################################################ - # install / clone custom non-master things + # Install / clone custom non-master things # for pip, we use --no-deps --ignore-installed # and make sure that all dependencies are already contained # in the conda env named "ci-env" ################################################################ - - name: "install custom non-master dependencies" + - name: Install custom boa shell: bash -el {0} run: | - micromamba activate ci-env - python -m pip install git+https://github.com/DerThorsten/boa.git@python_api_v2 --no-deps --ignore-installed - + python -m pip install git+https://github.com/DerThorsten/boa.git@python_api_v2 --no-deps --ignore-installed ################################################################ - # build ALL recipes + # Build ALL recipes ################################################################ - - name: "build packages workflow_dispatch" + - name: Build ALL packages shell: bash -el {0} run: | - cd ${GITHUB_WORKSPACE} - python builder.py build directory $GITHUB_WORKSPACE/recipes/recipes --skip-tests - python builder.py build directory $GITHUB_WORKSPACE/recipes/recipes_emscripten --emscripten-wasm32 + python builder.py build directory $GITHUB_WORKSPACE/recipes/recipes --skip-tests + python builder.py build directory $GITHUB_WORKSPACE/recipes/recipes_emscripten --emscripten-wasm32 diff --git a/.github/workflows/build_recipes.yaml b/.github/workflows/build_recipes.yaml index 78ec082d4..4c6a059f3 100644 --- a/.github/workflows/build_recipes.yaml +++ b/.github/workflows/build_recipes.yaml @@ -18,13 +18,14 @@ jobs: emsdk_ver: ["3.1.45"] steps: + ################################################################ + # SETUP + ################################################################ - name: Checkout repo uses: actions/checkout@v4 with: fetch-depth: 0 - - - name: Maximize build space run: | sudo rm -rf /usr/share/dotnet @@ -32,118 +33,102 @@ jobs: sudo rm -rf "/usr/local/share/boost" sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - - name: delete fortran... - run: | - sudo apt-get remove gfortran -y + - name: Delete fortran + run: sudo apt-get remove gfortran -y ################################################################ # CONFIG ################################################################ - - name: global config + - name: Global config shell: bash -el {0} - run: | - git config --global advice.detachedHead false - cp $GITHUB_WORKSPACE/.github/workflows/.condarc $HOME - cp $GITHUB_WORKSPACE/conda_build_config.yaml $HOME + run: git config --global advice.detachedHead false ################################################################ # MAMBA ################################################################ - - uses: mamba-org/setup-micromamba@v1 + - name: Install micromamba + uses: mamba-org/setup-micromamba@v1 with: environment-file: ci_env.yml - environment-name: ci - init-shell: >- - bash + init-shell: bash cache-environment: true post-cleanup: 'all' ################################################################ - # setup emsdk + # EMSDK ################################################################ - - name: "setup emsdk" + - name: Setup emsdk shell: bash -el {0} run: | - ./emsdk/setup_emsdk.sh ${{ matrix.emsdk_ver }} $(pwd)/emsdk_install - + ./emsdk/setup_emsdk.sh ${{ matrix.emsdk_ver }} $(pwd)/emsdk_install + ################################################################ # POST ENV INSTALL CONFIG ################################################################ - - name: post env install config + - name: Post env install config shell: bash -el {0} run: | - cp $GITHUB_WORKSPACE/.github/workflows/.condarc $HOME/.condarc + cp $GITHUB_WORKSPACE/.github/workflows/.condarc $HOME + cp $GITHUB_WORKSPACE/conda_build_config.yaml $HOME playwright install - - ################################################################ - # install / clone custom non-master things + # Install / clone custom non-master things # for pip, we use --no-deps --ignore-installed # and make sure that all dependencies are already contained # in the conda env named "ci-env" ################################################################ - - name: "install custom non-master dependencies" + - name: Install custom boa shell: bash -el {0} run: | - python -m pip install git+https://github.com/DerThorsten/boa.git@python_api_v2 --no-deps --ignore-installed + python -m pip install git+https://github.com/DerThorsten/boa.git@python_api_v2 --no-deps --ignore-installed ################################################################ - # run pytests + # PYTESTS ################################################################ - - name: "test config files" + - name: Test config files shell: bash -el {0} - run: | - cd testing - pytest test_empack_config.py + run: pytest test_empack_config.py + working-directory: testing # ################################################################ - # # build pyjs + # # PYJS # ################################################################ - # - name: "build package" + # - name: Build pyjs # shell: bash -el {0} # run: | - # cd ${GITHUB_WORKSPACE} # python builder.py build explicit $GITHUB_WORKSPACE/recipes/recipes/emscripten_emscripten-wasm32 - # python builder.py build explicit $GITHUB_WORKSPACE/recipes/recipes_emscripten/pyjs --emscripten-wasm32 - - + # python builder.py build explicit $GITHUB_WORKSPACE/recipes/recipes_emscripten/pyjs --emscripten-wasm32 + ################################################################ - # build recipes with changes PUSH + # PUSH ################################################################ - - name: "build packages push" + - name: Build recipes with changes PUSH shell: bash -el {0} if: github.event_name == 'push' run: | - cd ${GITHUB_WORKSPACE} python builder.py build changed $GITHUB_WORKSPACE/ origin/main~1 origin/main - ################################################################ - # build recipes with changes PULL_REQUEST + # PULL_REQUEST ################################################################ - - name: "build packages pull_request" + - name: Build recipes with changes PULL_REQUEST shell: bash -el {0} if: github.event_name == 'pull_request' run: | - cd ${GITHUB_WORKSPACE} - python builder.py build changed $GITHUB_WORKSPACE/ origin/main HEAD - + python builder.py build changed $GITHUB_WORKSPACE/ origin/main HEAD ################################################################ - # quetz upload packages + # UPLOAD ################################################################ - - name: "quetz upload packages" + - name: Upload packages to Quetz if: github.event_name == 'push' shell: bash -el {0} run: | - mkdir -p ${CONDA_PREFIX}/conda-bld/emscripten-wasm32 mkdir -p ${CONDA_PREFIX}/conda-bld/linux-64 mkdir -p ${CONDA_PREFIX}/conda-bld/noarch - - + if [ $(ls ${CONDA_PREFIX}/conda-bld/emscripten-wasm32/*.tar.bz2 | wc -l) -ne 0 ]; then QUETZ_API_KEY=${{ secrets.QUETZ_API_KEY}} quetz-client https://beta.mamba.pm/channels/emscripten-forge ${CONDA_PREFIX}/conda-bld/emscripten-wasm32/*.tar.bz2 fi diff --git a/.github/workflows/build_simple.yaml b/.github/workflows/build_simple.yaml index 57fe433e0..7155a039a 100644 --- a/.github/workflows/build_simple.yaml +++ b/.github/workflows/build_simple.yaml @@ -19,7 +19,9 @@ jobs: emsdk_ver: ["3.1.45"] steps: - + ################################################################ + # SETUP + ################################################################ - name: Checkout repo uses: actions/checkout@v4 with: @@ -28,68 +30,62 @@ jobs: ################################################################ # CONFIG ################################################################ - - name: global config + - name: Global config shell: bash -el {0} - run: | - git config --global advice.detachedHead false - cp $GITHUB_WORKSPACE/.github/workflows/.condarc $HOME/.condarc - cp $GITHUB_WORKSPACE/conda_build_config.yaml $HOME + run: git config --global advice.detachedHead false ################################################################ # MAMBA ################################################################ - - uses: mamba-org/setup-micromamba@v1 + - name: Install micromamba + uses: mamba-org/setup-micromamba@v1 with: environment-file: ci_env.yml - environment-name: ci - init-shell: >- - bash + init-shell: bash cache-environment: true post-cleanup: 'all' ################################################################ # POST ENV INSTALL CONFIG ################################################################ - - name: post env install config + - name: Post env install config shell: bash -el {0} run: | - cp $GITHUB_WORKSPACE/.github/workflows/.condarc $HOME/.condarc + cp $GITHUB_WORKSPACE/.github/workflows/.condarc $HOME + cp $GITHUB_WORKSPACE/conda_build_config.yaml $HOME playwright install ################################################################ - # setup emsdk + # EMSDK ################################################################ - - name: "setup emsdk" + - name: Setup emsdk shell: bash -el {0} run: | - ./emsdk/setup_emsdk.sh ${{ matrix.emsdk_ver }} $(pwd)/emsdk_install + ./emsdk/setup_emsdk.sh ${{ matrix.emsdk_ver }} $(pwd)/emsdk_install ################################################################ - # install / clone custom non-master things + # Install / clone custom non-master things # for pip, we use --no-deps --ignore-installed # and make sure that all dependencies are already contained # in the conda env named "ci-env" ################################################################ - - name: "install custom non-master dependencies" + - name: Install custom boa shell: bash -el {0} run: | - python -m pip install git+https://github.com/DerThorsten/boa.git@python_api_v2 --no-deps --ignore-installed - + python -m pip install git+https://github.com/DerThorsten/boa.git@python_api_v2 --no-deps --ignore-installed ################################################################ - # build a package which is **not** on emscripten forge + # Build a package which is **not** on emscripten forge ################################################################ - - name: "build package" + - name: Build package not on emscripten-forge shell: bash -el {0} run: | - cd ${GITHUB_WORKSPACE} - python builder.py build explicit $GITHUB_WORKSPACE/testing/test_recipes/only_py_tests --emscripten-wasm32 + python builder.py build explicit $GITHUB_WORKSPACE/testing/test_recipes/only_py_tests --emscripten-wasm32 ################################################################ - # build a simple package + # Build a simple package ################################################################ - - name: "build package" + - name: Build regex shell: bash -el {0} run: | - cd ${GITHUB_WORKSPACE} - python builder.py build explicit $GITHUB_WORKSPACE/recipes/recipes_emscripten/regex --emscripten-wasm32 + python builder.py build explicit $GITHUB_WORKSPACE/recipes/recipes_emscripten/regex --emscripten-wasm32 From e01f1027c4f5d373cc11432dde9951187b190754 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Tue, 23 Jan 2024 17:52:50 +0100 Subject: [PATCH 04/14] Change env name --- .github/workflows/build_simple.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_simple.yaml b/.github/workflows/build_simple.yaml index 7155a039a..6c46db19a 100644 --- a/.github/workflows/build_simple.yaml +++ b/.github/workflows/build_simple.yaml @@ -41,6 +41,7 @@ jobs: uses: mamba-org/setup-micromamba@v1 with: environment-file: ci_env.yml + environment-name: ci init-shell: bash cache-environment: true post-cleanup: 'all' From 155ce00745700c4ecbef2a05cd75119390c47016 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Tue, 23 Jan 2024 17:55:35 +0100 Subject: [PATCH 05/14] Remove windows files for testing ci --- recipes/recipes_emscripten/bzip2/bld.bat | 28 ++++++++-------- recipes/recipes_emscripten/lua/bld.bat | 21 ------------ .../recipes_emscripten/nlohmann_json/bld.bat | 13 -------- recipes/recipes_emscripten/pybind11/bld.bat | 13 -------- .../recipes_emscripten/pybind11_json/bld.bat | 13 -------- recipes/recipes_emscripten/sqlite/bld.bat | 32 ------------------- recipes/recipes_emscripten/xcanvas/bld.bat | 14 -------- recipes/recipes_emscripten/xeus-lite/bld.bat | 13 -------- recipes/recipes_emscripten/xeus/bld.bat | 13 -------- recipes/recipes_emscripten/xproperty/bld.bat | 13 -------- recipes/recipes_emscripten/xtl/bld.bat | 13 -------- recipes/recipes_emscripten/xwidgets/bld.bat | 15 --------- 12 files changed, 14 insertions(+), 187 deletions(-) delete mode 100644 recipes/recipes_emscripten/lua/bld.bat delete mode 100644 recipes/recipes_emscripten/nlohmann_json/bld.bat delete mode 100644 recipes/recipes_emscripten/pybind11/bld.bat delete mode 100644 recipes/recipes_emscripten/pybind11_json/bld.bat delete mode 100644 recipes/recipes_emscripten/sqlite/bld.bat delete mode 100644 recipes/recipes_emscripten/xcanvas/bld.bat delete mode 100644 recipes/recipes_emscripten/xeus-lite/bld.bat delete mode 100644 recipes/recipes_emscripten/xeus/bld.bat delete mode 100644 recipes/recipes_emscripten/xproperty/bld.bat delete mode 100644 recipes/recipes_emscripten/xtl/bld.bat delete mode 100644 recipes/recipes_emscripten/xwidgets/bld.bat diff --git a/recipes/recipes_emscripten/bzip2/bld.bat b/recipes/recipes_emscripten/bzip2/bld.bat index 4f870aecf..f40b1e183 100644 --- a/recipes/recipes_emscripten/bzip2/bld.bat +++ b/recipes/recipes_emscripten/bzip2/bld.bat @@ -1,15 +1,15 @@ -REM edited from the one from Anaconda -copy %RECIPE_DIR%\CMakeLists.txt CMakeLists.txt - -mkdir build -cd build - -cmake -G "Ninja" ^ - -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -D CMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -D CMAKE_BUILD_TYPE=Release ^ - -D BUILD_SHARED_LIBS=OFF ^ - -D BZIP2_SKIP_TOOLS=ON ^ - .. - +REM edited from the one from Anaconda +copy %RECIPE_DIR%\CMakeLists.txt CMakeLists.txt + +mkdir build +cd build + +cmake -G "Ninja" ^ + -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ + -D CMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ + -D CMAKE_BUILD_TYPE=Release ^ + -D BUILD_SHARED_LIBS=OFF ^ + -D BZIP2_SKIP_TOOLS=ON ^ + .. + ninja install --verbose \ No newline at end of file diff --git a/recipes/recipes_emscripten/lua/bld.bat b/recipes/recipes_emscripten/lua/bld.bat deleted file mode 100644 index 5b53af257..000000000 --- a/recipes/recipes_emscripten/lua/bld.bat +++ /dev/null @@ -1,21 +0,0 @@ -:: MSVC is preferred. -set CC=cl.exe -set CXX=cl.exe - -mkdir build -cd build -cmake ^ - -G "Ninja" ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DBUILD_SHARED_LIBS=ON ^ - %SRC_DIR% -if errorlevel 1 exit 1 - -:: Build. -cmake --build . --config Release -if errorlevel 1 exit 1 - -:: Install. -cmake --build . --config Release --target install -if errorlevel 1 exit 1 diff --git a/recipes/recipes_emscripten/nlohmann_json/bld.bat b/recipes/recipes_emscripten/nlohmann_json/bld.bat deleted file mode 100644 index 83fe765a0..000000000 --- a/recipes/recipes_emscripten/nlohmann_json/bld.bat +++ /dev/null @@ -1,13 +0,0 @@ -mkdir build -cd build - -cmake .. ^ - -GNinja ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -if errorlevel 1 exit 1 - -ninja install --verbose -if errorlevel 1 exit 1 diff --git a/recipes/recipes_emscripten/pybind11/bld.bat b/recipes/recipes_emscripten/pybind11/bld.bat deleted file mode 100644 index 83fe765a0..000000000 --- a/recipes/recipes_emscripten/pybind11/bld.bat +++ /dev/null @@ -1,13 +0,0 @@ -mkdir build -cd build - -cmake .. ^ - -GNinja ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -if errorlevel 1 exit 1 - -ninja install --verbose -if errorlevel 1 exit 1 diff --git a/recipes/recipes_emscripten/pybind11_json/bld.bat b/recipes/recipes_emscripten/pybind11_json/bld.bat deleted file mode 100644 index 83fe765a0..000000000 --- a/recipes/recipes_emscripten/pybind11_json/bld.bat +++ /dev/null @@ -1,13 +0,0 @@ -mkdir build -cd build - -cmake .. ^ - -GNinja ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -if errorlevel 1 exit 1 - -ninja install --verbose -if errorlevel 1 exit 1 diff --git a/recipes/recipes_emscripten/sqlite/bld.bat b/recipes/recipes_emscripten/sqlite/bld.bat deleted file mode 100644 index 0022ac60b..000000000 --- a/recipes/recipes_emscripten/sqlite/bld.bat +++ /dev/null @@ -1,32 +0,0 @@ -if "%ARCH%"=="32" ( -set PLATFORM=x86 -) else ( -set PLATFORM=x64 -) - -:: build the shell -cl ^ - /DSQLITE_ENABLE_RTREE ^ - /DSQLITE_ENABLE_GEOPOLY ^ - /DSQLITE_ENABLE_COLUMN_METADATA=1 ^ - /DSQLITE_MAX_VARIABLE_NUMBER=250000 ^ - /DSQLITE_ENABLE_JSON1 ^ - /DSQLITE_ENABLE_FTS5 ^ - shell.c sqlite3.c -Fesqlite3.exe ^ - /DSQLITE_EXPORTS - -:: build the dll -cl ^ - /DSQLITE_ENABLE_RTREE ^ - /DSQLITE_ENABLE_GEOPOLY ^ - /DSQLITE_ENABLE_COLUMN_METADATA=1 ^ - /DSQLITE_MAX_VARIABLE_NUMBER=250000 ^ - /DSQLITE_ENABLE_JSON1 ^ - /DSQLITE_ENABLE_FTS5 ^ - sqlite3.c -link -dll -out:sqlite3.dll - -COPY sqlite3.exe %LIBRARY_BIN% || exit 1 -COPY sqlite3.dll %LIBRARY_BIN% || exit 1 -COPY sqlite3.lib %LIBRARY_LIB% || exit 1 -COPY sqlite3.h %LIBRARY_INC% || exit 1 -COPY sqlite3ext.h %LIBRARY_INC% || exit 1 diff --git a/recipes/recipes_emscripten/xcanvas/bld.bat b/recipes/recipes_emscripten/xcanvas/bld.bat deleted file mode 100644 index cc73a00a6..000000000 --- a/recipes/recipes_emscripten/xcanvas/bld.bat +++ /dev/null @@ -1,14 +0,0 @@ -mkdir build -cd build - -cmake .. ^ - -GNinja ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DXCANVAS_BUILD_SHARED_LIBS=OFF ^ - -DXCANVAS_BUILD_STATIC_LIBS=ON - -if errorlevel 1 exit 1 - -ninja install --verbose -if errorlevel 1 exit 1 diff --git a/recipes/recipes_emscripten/xeus-lite/bld.bat b/recipes/recipes_emscripten/xeus-lite/bld.bat deleted file mode 100644 index 83fe765a0..000000000 --- a/recipes/recipes_emscripten/xeus-lite/bld.bat +++ /dev/null @@ -1,13 +0,0 @@ -mkdir build -cd build - -cmake .. ^ - -GNinja ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -if errorlevel 1 exit 1 - -ninja install --verbose -if errorlevel 1 exit 1 diff --git a/recipes/recipes_emscripten/xeus/bld.bat b/recipes/recipes_emscripten/xeus/bld.bat deleted file mode 100644 index 83fe765a0..000000000 --- a/recipes/recipes_emscripten/xeus/bld.bat +++ /dev/null @@ -1,13 +0,0 @@ -mkdir build -cd build - -cmake .. ^ - -GNinja ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -if errorlevel 1 exit 1 - -ninja install --verbose -if errorlevel 1 exit 1 diff --git a/recipes/recipes_emscripten/xproperty/bld.bat b/recipes/recipes_emscripten/xproperty/bld.bat deleted file mode 100644 index 83fe765a0..000000000 --- a/recipes/recipes_emscripten/xproperty/bld.bat +++ /dev/null @@ -1,13 +0,0 @@ -mkdir build -cd build - -cmake .. ^ - -GNinja ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -if errorlevel 1 exit 1 - -ninja install --verbose -if errorlevel 1 exit 1 diff --git a/recipes/recipes_emscripten/xtl/bld.bat b/recipes/recipes_emscripten/xtl/bld.bat deleted file mode 100644 index 83fe765a0..000000000 --- a/recipes/recipes_emscripten/xtl/bld.bat +++ /dev/null @@ -1,13 +0,0 @@ -mkdir build -cd build - -cmake .. ^ - -GNinja ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -if errorlevel 1 exit 1 - -ninja install --verbose -if errorlevel 1 exit 1 diff --git a/recipes/recipes_emscripten/xwidgets/bld.bat b/recipes/recipes_emscripten/xwidgets/bld.bat deleted file mode 100644 index fe8169e43..000000000 --- a/recipes/recipes_emscripten/xwidgets/bld.bat +++ /dev/null @@ -1,15 +0,0 @@ -mkdir build -cd build - -cmake .. ^ - -GNinja ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -DXWIDGETS_BUILD_SHARED_LIBS=OFF ^ - -DXWIDGETS_BUILD_STATIC_LIBS=ON ^ - -if errorlevel 1 exit 1 - -ninja install --verbose -if errorlevel 1 exit 1 From 5be513dadee3605429c4eba87a9171ce210c4f58 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Tue, 23 Jan 2024 18:02:09 +0100 Subject: [PATCH 06/14] Set env to ci --- .github/workflows/build_recipes.yaml | 1 + recipes/recipes_emscripten/bzip2/bld.bat | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 recipes/recipes_emscripten/bzip2/bld.bat diff --git a/.github/workflows/build_recipes.yaml b/.github/workflows/build_recipes.yaml index 4c6a059f3..91e3e3d93 100644 --- a/.github/workflows/build_recipes.yaml +++ b/.github/workflows/build_recipes.yaml @@ -50,6 +50,7 @@ jobs: uses: mamba-org/setup-micromamba@v1 with: environment-file: ci_env.yml + environment-name: ci init-shell: bash cache-environment: true post-cleanup: 'all' diff --git a/recipes/recipes_emscripten/bzip2/bld.bat b/recipes/recipes_emscripten/bzip2/bld.bat deleted file mode 100644 index f40b1e183..000000000 --- a/recipes/recipes_emscripten/bzip2/bld.bat +++ /dev/null @@ -1,15 +0,0 @@ -REM edited from the one from Anaconda -copy %RECIPE_DIR%\CMakeLists.txt CMakeLists.txt - -mkdir build -cd build - -cmake -G "Ninja" ^ - -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -D CMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -D CMAKE_BUILD_TYPE=Release ^ - -D BUILD_SHARED_LIBS=OFF ^ - -D BZIP2_SKIP_TOOLS=ON ^ - .. - -ninja install --verbose \ No newline at end of file From bb1677839917d86d469b7d3fc317e5184171b0f2 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Wed, 24 Jan 2024 12:10:44 +0100 Subject: [PATCH 07/14] Update boa command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 33b1aae3f..27071c1b7 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ channels: **5a** Build a package (simple version): To build a package, run this from the root of the repository (replace `regex` with the package you want to build) ```bash -boa build --target=emscripten-wasm32 recipes/recipes_emscripten/regex +boa build --target-platform=emscripten-wasm32 recipes/recipes_emscripten/regex -m conda_build_config.yaml ``` This should work in principle, but will not run the python tests of the package. From c9b24e6c257c4cff86eecb0f2e4b4d17f53cda17 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Wed, 24 Jan 2024 12:18:01 +0100 Subject: [PATCH 08/14] Test build all --- .github/workflows/build_all.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_all.yaml b/.github/workflows/build_all.yaml index c4f30611a..9e8f81b78 100644 --- a/.github/workflows/build_all.yaml +++ b/.github/workflows/build_all.yaml @@ -1,5 +1,6 @@ name: build all on: + pull_request: schedule: - cron: "0 14 * * *" workflow_dispatch: From d8825d15ffb65f087bc93778112c224ffa61be91 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Wed, 24 Jan 2024 12:27:31 +0100 Subject: [PATCH 09/14] Pin ruamel.yaml to v0.17 `safe_load()` has been removed in v0.18 which is used by boa/core/test.py --- ci_env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_env.yml b/ci_env.yml index bf0ec965b..0750510f1 100644 --- a/ci_env.yml +++ b/ci_env.yml @@ -32,7 +32,7 @@ dependencies: - cxx-compiler - c-compiler # hack to get in boas dependencies - - ruamel.yaml + - ruamel.yaml ==0.17 - jinja2 - rich - prompt_toolkit From 56ca7eff10d928d6c75a952074d7d1dbd0158e30 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Wed, 24 Jan 2024 12:31:31 +0100 Subject: [PATCH 10/14] Relax pin --- ci_env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_env.yml b/ci_env.yml index 0750510f1..49740460f 100644 --- a/ci_env.yml +++ b/ci_env.yml @@ -32,7 +32,7 @@ dependencies: - cxx-compiler - c-compiler # hack to get in boas dependencies - - ruamel.yaml ==0.17 + - ruamel.yaml < 0.18 - jinja2 - rich - prompt_toolkit From 96da331a0efd5b8ec2eff16783a3df58d11dfce3 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Wed, 24 Jan 2024 12:38:17 +0100 Subject: [PATCH 11/14] Set env name to ci --- .github/workflows/build_all.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_all.yaml b/.github/workflows/build_all.yaml index 9e8f81b78..340f3dd10 100644 --- a/.github/workflows/build_all.yaml +++ b/.github/workflows/build_all.yaml @@ -42,6 +42,7 @@ jobs: uses: mamba-org/setup-micromamba@v1 with: environment-file: ci_env.yml + environment-name: ci init-shell: bash cache-environment: true post-cleanup: 'all' From 7781764b1462176b161c1e4664ee3e12e654bb63 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Wed, 24 Jan 2024 12:42:44 +0100 Subject: [PATCH 12/14] Fix attribute error with CondaBuildSpec Downgrade to use conda-build=3.27 https://github.com/mamba-org/boa/issues/388 --- ci_env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_env.yml b/ci_env.yml index 49740460f..d324cc978 100644 --- a/ci_env.yml +++ b/ci_env.yml @@ -17,7 +17,7 @@ dependencies: - liblief - py-lief - conda >= 23.7.4 - - conda-build >= 3.26.1 + - conda-build >= 3.26.1, <3.28 - pyyaml - click == 8.0.4 - typer >= 0.7.0 From ab240873f4a134fbf9ec20b6443bebf6d36044b0 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Wed, 24 Jan 2024 12:54:26 +0100 Subject: [PATCH 13/14] Remove duplicates --- ci_env.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci_env.yml b/ci_env.yml index d324cc978..a970bdb38 100644 --- a/ci_env.yml +++ b/ci_env.yml @@ -7,11 +7,8 @@ dependencies: - empack >=3,<4 - colorama - ruamel - - ruamel.yaml - - rich - mamba >= 0.23.1 - micromamba >= 0.23.1 - - jsonschema - cython - patchelf - liblief From 2ba47609f8aa38fd9ac42730e47be25048c60fd1 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Wed, 24 Jan 2024 12:55:02 +0100 Subject: [PATCH 14/14] Set build all to run on schedule only The workflow runs but some package builds fail, so it is working as intended. --- .github/workflows/build_all.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_all.yaml b/.github/workflows/build_all.yaml index 340f3dd10..a05bd0ba9 100644 --- a/.github/workflows/build_all.yaml +++ b/.github/workflows/build_all.yaml @@ -1,6 +1,5 @@ name: build all on: - pull_request: schedule: - cron: "0 14 * * *" workflow_dispatch: