Skip to content

Commit 67f530c

Browse files
xhochyxhochy
authored
Merge pull request #495 from velonica0/riscv64-cross-fix-22.x
[22.x] Support cross-compiling to linux-riscv64
2 parents 0b74806 + 4dc8fb1 commit 67f530c

20 files changed

Lines changed: 211 additions & 131 deletions

‎.azure-pipelines/azure-pipelines-osx.yml‎

100755100644
File mode changed.

‎.azure-pipelines/azure-pipelines-win.yml‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎.ci_support/linux_64_.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
c_compiler:
22
- gcc
33
c_compiler_version:
4-
- '14'
4+
- '15'
55
c_stdlib:
66
- sysroot
77
c_stdlib_version:
@@ -13,7 +13,7 @@ channel_targets:
1313
cxx_compiler:
1414
- gxx
1515
cxx_compiler_version:
16-
- '14'
16+
- '15'
1717
docker_image:
1818
- quay.io/condaforge/linux-anvil-x86_64:alma10
1919
github_actions_labels:

‎.ci_support/linux_aarch64_.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
c_compiler:
22
- gcc
33
c_compiler_version:
4-
- '14'
4+
- '15'
55
c_stdlib:
66
- sysroot
77
c_stdlib_version:
@@ -13,7 +13,7 @@ channel_targets:
1313
cxx_compiler:
1414
- gxx
1515
cxx_compiler_version:
16-
- '14'
16+
- '15'
1717
docker_image:
1818
- quay.io/condaforge/linux-anvil-aarch64:alma10
1919
github_actions_labels:

‎.ci_support/linux_riscv64_.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
c_compiler:
2+
- gcc
3+
c_compiler_version:
4+
- '15'
5+
c_stdlib:
6+
- sysroot
7+
c_stdlib_version:
8+
- '2.39'
9+
channel_sources:
10+
- conda-forge
11+
channel_targets:
12+
- conda-forge main
13+
cxx_compiler:
14+
- gxx
15+
cxx_compiler_version:
16+
- '15'
17+
docker_image:
18+
- quay.io/condaforge/linux-anvil-x86_64:alma10
19+
icu:
20+
- '78'
21+
openssl:
22+
- '3.5'
23+
target_platform:
24+
- linux-riscv64
25+
zip_keys:
26+
- - c_compiler_version
27+
- cxx_compiler_version
28+
zlib:
29+
- '1'

‎.ci_support/migrations/icu78.yaml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.ci_support/osx_64_.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
55
c_compiler:
66
- clang
77
c_compiler_version:
8-
- '19'
8+
- '21'
99
c_stdlib:
1010
- macosx_deployment_target
1111
c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
1717
cxx_compiler:
1818
- clangxx
1919
cxx_compiler_version:
20-
- '19'
20+
- '21'
2121
icu:
2222
- '78'
2323
macos_machine:

‎.ci_support/osx_arm64_.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
55
c_compiler:
66
- clang
77
c_compiler_version:
8-
- '19'
8+
- '21'
99
c_stdlib:
1010
- macosx_deployment_target
1111
c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
1717
cxx_compiler:
1818
- clangxx
1919
cxx_compiler_version:
20-
- '19'
20+
- '21'
2121
icu:
2222
- '78'
2323
macos_machine:

‎.github/workflows/conda-build.yml‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,46 @@ jobs:
4646
resize_partitions: False
4747
runs_on: ['namespace-profile-8cpu-on-linux-aarch64;container.privileged=true;container.mount-scratch=true']
4848
tools_install_dir: ~/miniforge3
49+
- CONFIG: linux_riscv64_
50+
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
51+
STORE_BUILD_ARTIFACTS: False
52+
UPLOAD_PACKAGES: True
53+
build_workspace_dir: build_artifacts
54+
docker_run_args:
55+
free_disk_space: skip
56+
os: ubuntu
57+
pagefile_size: 0
58+
resize_partitions: False
59+
runs_on: ['ubuntu-latest']
60+
tools_install_dir: ~/miniforge3
61+
- CONFIG: win_64_
62+
STORE_BUILD_ARTIFACTS: False
63+
UPLOAD_PACKAGES: True
64+
build_platform: win-64
65+
build_workspace_dir: D:\\bld\\
66+
docker_run_args:
67+
free_disk_space: skip
68+
os: windows
69+
pagefile_size: 0
70+
resize_partitions: False
71+
runs_on: ['windows-2022']
72+
tools_install_dir: D:\Miniforge
73+
- CONFIG: win_arm64_
74+
STORE_BUILD_ARTIFACTS: False
75+
UPLOAD_PACKAGES: True
76+
build_platform: win-64
77+
build_workspace_dir: D:\\bld\\
78+
docker_run_args:
79+
free_disk_space: skip
80+
os: windows
81+
pagefile_size: 0
82+
resize_partitions: False
83+
runs_on: ['windows-2022']
84+
tools_install_dir: D:\Miniforge
4985
steps:
5086

5187
- name: Checkout code
52-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
88+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5389
- name: Configure binfmt_misc
5490
if: matrix.os == 'ubuntu'
5591
shell: bash
@@ -78,7 +114,7 @@ jobs:
78114
run: |
79115
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
80116
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
81-
export GIT_BRANCH="$(basename $GITHUB_REF)"
117+
export GIT_BRANCH="${GITHUB_REF_NAME}"
82118
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
83119
export flow_run_id="github_$GITHUB_RUN_ID"
84120
export remote_url="https://github.com/$GITHUB_REPOSITORY"
@@ -108,7 +144,7 @@ jobs:
108144
run: |
109145
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
110146
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
111-
export GIT_BRANCH="$(basename $GITHUB_REF)"
147+
export GIT_BRANCH="${GITHUB_REF_NAME}"
112148
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
113149
export flow_run_id="github_$GITHUB_RUN_ID"
114150
export remote_url="https://github.com/$GITHUB_REPOSITORY"
@@ -130,6 +166,7 @@ jobs:
130166
set "sha=%GITHUB_SHA%"
131167
call ".scripts\run_win_build.bat"
132168
env:
169+
BUILD_PLATFORM: ${{ matrix.build_platform }}
133170
CI: github_actions
134171
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
135172
CONFIG: ${{ matrix.CONFIG }}

‎.scripts/build_steps.sh‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)