Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to gcc14 attempt 2 #15

Merged
merged 5 commits into from
Nov 28, 2024
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
60 changes: 1 addition & 59 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on: [push, pull_request]
jobs:
build:
name: ${{ matrix.CONFIG }}
runs-on: ${{ matrix.os }}-latest
runs-on: as4
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -43,61 +43,3 @@ jobs:
echo "::endgroup::"
./.scripts/run_docker_build.sh

- name: Build on macOS
if: matrix.os == 'macos'
env:
CONFIG: ${{ matrix.CONFIG }}
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
CI: github_actions
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
shell: bash
run: |
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
export GIT_BRANCH="$(basename $GITHUB_REF)"
if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
export IS_PR_BUILD="True"
else
export IS_PR_BUILD="False"
fi
./.scripts/run_osx_build.sh

- name: Install Miniconda for windows
uses: conda-incubator/setup-miniconda@v2
with:
miniforge-version: latest
miniforge-variant: Mambaforge
if: matrix.os == 'windows'
- name: Build on windows
shell: cmd
run: |
call activate base
mamba.exe install -c conda-forge 'python=3.9' conda-build conda pip boa conda-forge-ci-setup=3
if errorlevel 1 exit 1
setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml
if errorlevel 1 exit 1


if EXIST LICENSE.txt (
copy LICENSE.txt "recipe\\recipe-scripts-license.txt"
)
conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml
if errorlevel 1 exit 1
set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%"
set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%"
if /i "%GITHUB_EVENT_NAME%" == "pull_request" (
set "IS_PR_BUILD=True"
) else (
set "IS_PR_BUILD=False"
)
if /i "%UPLOAD_PACKAGES%" == "true" (
if /i "%IS_PR_BUILD%" == "false" (
upload_package .\ ".\recipe" .ci_support\%CONFIG%.yaml
)
)
env:
PYTHONUNBUFFERED: 1
CONFIG: ${{ matrix.CONFIG }}
CI: github_actions
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
if: matrix.os == 'windows'
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "riscv-gnu-toolchain"]
path = riscv-gnu-toolchain
url = https://github.com/riscv/riscv-gnu-toolchain.git
url = https://github.com/ucb-bar/riscv-gnu-toolchain.git
6 changes: 3 additions & 3 deletions .scripts/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ CONDARC


mamba install --update-specs --yes --quiet --channel conda-forge \
conda-build pip boa conda-forge-ci-setup=3
conda-build pip boa conda-forge-ci-setup
mamba update --update-specs --yes --quiet --channel conda-forge \
conda-build pip boa conda-forge-ci-setup=3
conda-build pip boa conda-forge-ci-setup

# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
Expand Down Expand Up @@ -79,4 +79,4 @@ fi

( startgroup "Final checks" ) 2> /dev/null

touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}"
touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}"
2 changes: 1 addition & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ TOOLCHAIN_NAME=riscv-tools
export LDFLAGS="$LDFLAGS -s"

# de-init unneeded qemu submodule
git -C ./riscv-gnu-toolchain submodule deinit --force qemu
# git -C ./riscv-gnu-toolchain submodule deinit --force qemu

NPROC=$CPU_COUNT ./build-toolchains.sh --prefix $PREFIX/$TOOLCHAIN_NAME --clean-after-install

Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ requirements:

test:
commands:
- test "$($PREFIX/riscv-tools/bin/riscv64-unknown-elf-gcc -dumpversion)" = "13.2.0"
- test "$($PREFIX/riscv-tools/bin/riscv64-unknown-elf-gcc -dumpversion)" = "14.2.0"
- riscv64-unknown-elf-ld --version
- riscv64-unknown-elf-gdb --version

Expand Down