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 gcc 14.2 #14

Closed
wants to merge 4 commits into from
Closed
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
28 changes: 28 additions & 0 deletions .ci_support/linux_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- ucb-bar main
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
expat:
- '2'
gmp:
- '6'
mpfr:
- '4'
ncurses:
- '6'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
target_platform:
- linux-64
zlib:
- '1'
zstd:
- '1.5'
28 changes: 28 additions & 0 deletions .ci_support/linux_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- ucb-bar main
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
expat:
- '2'
gmp:
- '6'
mpfr:
- '4'
ncurses:
- '6'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
target_platform:
- linux-64
zlib:
- '1'
zstd:
- '1.5'
28 changes: 28 additions & 0 deletions .ci_support/linux_64_python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- ucb-bar main
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
expat:
- '2'
gmp:
- '6'
mpfr:
- '4'
ncurses:
- '6'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
target_platform:
- linux-64
zlib:
- '1'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cdt_name:
- cos6
- conda
channel_sources:
- conda-forge
channel_targets:
- ucb-bar main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
expat:
- '2'
gmp:
Expand All @@ -15,13 +15,14 @@ mpfr:
ncurses:
- '6'
pin_run_as_build:
gmp:
max_pin: x
mpfr:
max_pin: x
zlib:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_cpython
target_platform:
- linux-64
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file was generated automatically from conda-smithy. To update this configuration,
# update the conda-forge.yml and/or the recipe/meta.yaml.
# -*- mode: yaml -*-
# -*- mode: jinja-yaml -*-

version: 2

Expand Down
19 changes: 0 additions & 19 deletions .github/workflows/automerge.yml

This file was deleted.

64 changes: 29 additions & 35 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,35 @@
# -*- mode: yaml -*-

name: Build conda package
on: [push, pull_request]
on:
push:

pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
cancel-in-progress: true

jobs:
build:
name: ${{ matrix.CONFIG }}
runs-on: ${{ matrix.os }}-latest
runs-on: ${{ matrix.runs_on }}
timeout-minutes: 360
strategy:
fail-fast: false
matrix:
include:
- CONFIG: linux_64_
- CONFIG: linux_64_python3.9.____cpython
UPLOAD_PACKAGES: True
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
os: ubuntu
runs_on: ['as4']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
steps:

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
fetch-depth: 0

- name: Build on Linux
if: matrix.os == 'ubuntu'
Expand All @@ -28,11 +40,15 @@ jobs:
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }}
CI: github_actions
CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}"
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
shell: bash
run: |
echo "::group::Configure binfmt_misc"
docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
export flow_run_id="github_$GITHUB_RUN_ID"
export remote_url="https://github.com/$GITHUB_REPOSITORY"
export sha="$GITHUB_SHA"
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
export GIT_BRANCH="$(basename $GITHUB_REF)"
if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
Expand All @@ -52,6 +68,9 @@ jobs:
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
shell: bash
run: |
export flow_run_id="github_$GITHUB_RUN_ID"
export remote_url="https://github.com/$GITHUB_REPOSITORY"
export sha="$GITHUB_SHA"
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
export GIT_BRANCH="$(basename $GITHUB_REF)"
if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
Expand All @@ -61,40 +80,15 @@ jobs:
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
)
)
set "flow_run_id=github_%GITHUB_RUN_ID%"
set "remote_url=https://github.com/%GITHUB_REPOSITORY%"
set "sha=%GITHUB_SHA%"
call ".scripts\run_win_build.bat"
env:
MINIFORGE_HOME: D:\Miniforge
PYTHONUNBUFFERED: 1
CONFIG: ${{ matrix.CONFIG }}
CI: github_actions
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/webservices.yml

This file was deleted.

26 changes: 18 additions & 8 deletions .scripts/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,23 @@ conda-build:
pkgs_dirs:
- ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache
- /opt/conda/pkgs
solver: libmamba

CONDARC


mamba install --update-specs --yes --quiet --channel conda-forge \
conda-build pip boa conda-forge-ci-setup=3
mamba update --update-specs --yes --quiet --channel conda-forge \
conda-build pip boa conda-forge-ci-setup=3
mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S)
echo > /opt/conda/conda-meta/history
micromamba install --root-prefix ~/.conda --prefix /opt/conda \
--yes --override-channels --channel conda-forge --strict-channel-priority \
pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1

# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

source run_conda_forge_build_setup



# make the build number clobber
make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

Expand All @@ -64,9 +67,16 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
# Drop into an interactive shell
/bin/bash
else
conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
--suppress-variables ${EXTRA_CB_OPTIONS:-} \
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml"
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \
--extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"
( startgroup "Inspecting artifacts" ) 2> /dev/null

# inspect_artifacts was only added in conda-forge-ci-setup 4.9.4
command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4"

( endgroup "Inspecting artifacts" ) 2> /dev/null

( startgroup "Uploading packages" ) 2> /dev/null

Expand Down
4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function startgroup {
echo "##[group]$1";;
travis )
echo "$1"
echo -en 'travis_fold:start:'"${1// /}"'\\r';;
echo -en 'travis_fold:start:'"${1// /}"'\r';;
github_actions )
echo "::group::$1";;
* )
Expand All @@ -28,7 +28,7 @@ function endgroup {
azure )
echo "##[endgroup]";;
travis )
echo -en 'travis_fold:end:'"${1// /}"'\\r';;
echo -en 'travis_fold:end:'"${1// /}"'\r';;
github_actions )
echo "::endgroup::";;
esac
Expand Down
9 changes: 9 additions & 0 deletions .scripts/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then
export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT})
fi

if [[ "${sha:-}" == "" ]]; then
pushd "${FEEDSTOCK_ROOT}"
sha=$(git rev-parse HEAD)
popd
fi

docker info

# In order for the conda-build process in the container to write to the mounted
Expand Down Expand Up @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \
-e CPU_COUNT \
-e BUILD_WITH_CONDA_DEBUG \
-e BUILD_OUTPUT_ID \
-e flow_run_id \
-e remote_url \
-e sha \
-e BINSTAR_TOKEN \
"${DOCKER_IMAGE}" \
bash \
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
About riscv-tools
=================
About riscv-tools-feedstock
===========================

Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/riscv-tools-feedstock/blob/main/LICENSE.txt)

Home: https://github.com/ucb-bar/riscv-tools-feedstock

Package license:

Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/ucb-bar-riscv-tools-feedstock/blob/master/LICENSE.txt)

Summary: RISC-V toolchain for UC Berkeley projects

Current build status
Expand Down
Loading
Loading