Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified .azure-pipelines/azure-pipelines-osx.yml
100755 → 100644
Empty file.
41 changes: 0 additions & 41 deletions .azure-pipelines/azure-pipelines-win.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
expat:
- '2'
ffmpeg:
- '8'
- '9'
fmt:
- '12.1'
freetype:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
expat:
- '2'
ffmpeg:
- '8'
- '9'
fmt:
- '12.1'
freetype:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
expat:
- '2'
ffmpeg:
- '8'
- '9'
fmt:
- '12.1'
freetype:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/ffmpeg9.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for ffmpeg 9
kind: version
migration_number: 1
ffmpeg:
- '9'
migrator_ts: 1786327004.7804887
8 changes: 0 additions & 8 deletions .ci_support/migrations/openjph031.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cxx_compiler_version:
expat:
- '2'
ffmpeg:
- '8'
- '9'
fmt:
- '12.1'
freetype:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cxx_compiler_version:
expat:
- '2'
ffmpeg:
- '8'
- '9'
fmt:
- '12.1'
freetype:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
expat:
- '2'
ffmpeg:
- '8'
- '9'
fmt:
- '12.1'
freetype:
Expand Down
19 changes: 16 additions & 3 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,22 @@ jobs:
resize_partitions: False
runs_on: ['ubuntu-latest']
tools_install_dir: ~/miniforge3
- CONFIG: win_64_
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
build_platform: win-64
build_workspace_dir: D:\\bld\\
docker_run_args:
free_disk_space: skip
os: windows
pagefile_size: 0
resize_partitions: False
runs_on: ['windows-2022']
tools_install_dir: D:\Miniforge
steps:

- name: Checkout code
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Configure binfmt_misc
if: matrix.os == 'ubuntu'
shell: bash
Expand Down Expand Up @@ -90,7 +102,7 @@ jobs:
run: |
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
export GIT_BRANCH="$(basename $GITHUB_REF)"
export GIT_BRANCH="${GITHUB_REF_NAME}"
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
export flow_run_id="github_$GITHUB_RUN_ID"
export remote_url="https://github.com/$GITHUB_REPOSITORY"
Expand Down Expand Up @@ -120,7 +132,7 @@ jobs:
run: |
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
export GIT_BRANCH="$(basename $GITHUB_REF)"
export GIT_BRANCH="${GITHUB_REF_NAME}"
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
export flow_run_id="github_$GITHUB_RUN_ID"
export remote_url="https://github.com/$GITHUB_REPOSITORY"
Expand All @@ -142,6 +154,7 @@ jobs:
set "sha=%GITHUB_SHA%"
call ".scripts\run_win_build.bat"
env:
BUILD_PLATFORM: ${{ matrix.build_platform }}
CI: github_actions
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
CONFIG: ${{ matrix.CONFIG }}
Expand Down
4 changes: 3 additions & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified .scripts/logging_utils.sh
100644 → 100755
Empty file.
8 changes: 5 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 49 additions & 12 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions azure-pipelines.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading