Skip to content

Commit b6d1169

Browse files
xhochyxhochy
authored
Merge pull request #496 from velonica0/riscv64-cross-fix-20.x
[20.x] Support cross-compiling to linux-riscv64
2 parents 8fd74ec + ed7a6d0 commit b6d1169

16 files changed

Lines changed: 127 additions & 41 deletions

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

100755100644
File mode changed.

‎.ci_support/linux_64_.yaml‎

Lines changed: 3 additions & 3 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,9 +13,9 @@ channel_targets:
1313
cxx_compiler:
1414
- gxx
1515
cxx_compiler_version:
16-
- '14'
16+
- '15'
1717
docker_image:
18-
- quay.io/condaforge/linux-anvil-x86_64:alma9
18+
- quay.io/condaforge/linux-anvil-x86_64:alma10
1919
icu:
2020
- '78'
2121
nodejs:

‎.ci_support/linux_aarch64_.yaml‎

Lines changed: 3 additions & 3 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,9 +13,9 @@ channel_targets:
1313
cxx_compiler:
1414
- gxx
1515
cxx_compiler_version:
16-
- '14'
16+
- '15'
1717
docker_image:
18-
- quay.io/condaforge/linux-anvil-x86_64:alma9
18+
- quay.io/condaforge/linux-anvil-x86_64:alma10
1919
icu:
2020
- '78'
2121
nodejs:

‎.ci_support/linux_riscv64_.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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+
nodejs:
22+
- '*'
23+
openssl:
24+
- '3.5'
25+
target_platform:
26+
- linux-riscv64
27+
zip_keys:
28+
- - c_compiler_version
29+
- cxx_compiler_version
30+
zlib:
31+
- '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: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
matrix:
2424
include:
2525
- CONFIG: linux_64_
26-
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
26+
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
2727
STORE_BUILD_ARTIFACTS: False
2828
UPLOAD_PACKAGES: True
2929
build_workspace_dir: build_artifacts
@@ -35,7 +35,19 @@ jobs:
3535
runs_on: ['ubuntu-latest']
3636
tools_install_dir: ~/miniforge3
3737
- CONFIG: linux_aarch64_
38-
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
38+
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
39+
STORE_BUILD_ARTIFACTS: False
40+
UPLOAD_PACKAGES: True
41+
build_workspace_dir: build_artifacts
42+
docker_run_args:
43+
free_disk_space: skip
44+
os: ubuntu
45+
pagefile_size: 0
46+
resize_partitions: False
47+
runs_on: ['ubuntu-latest']
48+
tools_install_dir: ~/miniforge3
49+
- CONFIG: linux_riscv64_
50+
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
3951
STORE_BUILD_ARTIFACTS: False
4052
UPLOAD_PACKAGES: True
4153
build_workspace_dir: build_artifacts
@@ -49,6 +61,7 @@ jobs:
4961
- CONFIG: win_64_
5062
STORE_BUILD_ARTIFACTS: False
5163
UPLOAD_PACKAGES: True
64+
build_platform: win-64
5265
build_workspace_dir: D:\\bld\\
5366
docker_run_args:
5467
free_disk_space: skip
@@ -60,6 +73,7 @@ jobs:
6073
- CONFIG: win_arm64_
6174
STORE_BUILD_ARTIFACTS: False
6275
UPLOAD_PACKAGES: True
76+
build_platform: win-64
6377
build_workspace_dir: D:\\bld\\
6478
docker_run_args:
6579
free_disk_space: skip
@@ -71,7 +85,7 @@ jobs:
7185
steps:
7286

7387
- name: Checkout code
74-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
88+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7589
- name: Configure binfmt_misc
7690
if: matrix.os == 'ubuntu'
7791
shell: bash
@@ -100,7 +114,7 @@ jobs:
100114
run: |
101115
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
102116
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
103-
export GIT_BRANCH="$(basename $GITHUB_REF)"
117+
export GIT_BRANCH="${GITHUB_REF_NAME}"
104118
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
105119
export flow_run_id="github_$GITHUB_RUN_ID"
106120
export remote_url="https://github.com/$GITHUB_REPOSITORY"
@@ -130,7 +144,7 @@ jobs:
130144
run: |
131145
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
132146
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
133-
export GIT_BRANCH="$(basename $GITHUB_REF)"
147+
export GIT_BRANCH="${GITHUB_REF_NAME}"
134148
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
135149
export flow_run_id="github_$GITHUB_RUN_ID"
136150
export remote_url="https://github.com/$GITHUB_REPOSITORY"
@@ -152,6 +166,7 @@ jobs:
152166
set "sha=%GITHUB_SHA%"
153167
call ".scripts\run_win_build.bat"
154168
env:
169+
BUILD_PLATFORM: ${{ matrix.build_platform }}
155170
CI: github_actions
156171
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
157172
CONFIG: ${{ matrix.CONFIG }}

‎.scripts/build_steps.sh‎

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

‎.scripts/logging_utils.sh‎

100644100755
File mode changed.

0 commit comments

Comments
 (0)