Skip to content

Fix download caching on CI #155

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.

Sign up for GitHub

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

Merged
fhunleth merged 2 commits into from
Aug 29, 2026
Merged

Fix download caching on CI #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
473b01a
Fix download caching on CI
fhunleth Aug 28, 2026
a8c8d9d
Normalize macOS ARM arch to arm for compatibility
fhunleth Aug 28, 2026
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
18 changes: 9 additions & 9 deletions .github/workflows/build-test-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ jobs:
uses: actions/cache@v5
with:
path: ~/.nerves/dl
key: nerves-dl-${{ inputs.toolchain }}-linux-x86_64
key: nerves-dl-${{ hashFiles('toolchain_config.exs', 'configs/**/defconfig', 'template/defaults/*_defconfig') }}-${{ inputs.toolchain }}
restore-keys: |
nerves-dl-${{ inputs.toolchain }}-linux-
nerves-dl-${{ inputs.toolchain }}-
nerves-dl-${{ hashFiles('toolchain_config.exs', 'configs/**/defconfig', 'template/defaults/*_defconfig') }}-
nerves-dl-

- name: Build toolchain
run: bash ${{ inputs.toolchain }}/build.sh "$GITHUB_WORKSPACE/o/${{ inputs.toolchain }}"
Expand Down Expand Up @@ -148,10 +148,10 @@ jobs:
uses: actions/cache@v5
with:
path: ~/.nerves/dl
key: nerves-dl-${{ inputs.toolchain }}-linux-aarch64
key: nerves-dl-${{ hashFiles('toolchain_config.exs', 'configs/**/defconfig', 'template/defaults/*_defconfig') }}-${{ inputs.toolchain }}
restore-keys: |
nerves-dl-${{ inputs.toolchain }}-linux-
nerves-dl-${{ inputs.toolchain }}-
nerves-dl-${{ hashFiles('toolchain_config.exs', 'configs/**/defconfig', 'template/defaults/*_defconfig') }}-
nerves-dl-

- name: Build toolchain
run: bash ${{ inputs.toolchain }}/build.sh "$GITHUB_WORKSPACE/o/${{ inputs.toolchain }}"
Expand Down Expand Up @@ -215,10 +215,10 @@ jobs:
uses: actions/cache@v5
with:
path: ~/.nerves/dl
key: nerves-dl-${{ inputs.toolchain }}-darwin-aarch64
key: nerves-dl-${{ hashFiles('toolchain_config.exs', 'configs/**/defconfig', 'template/defaults/*_defconfig') }}-${{ inputs.toolchain }}
restore-keys: |
nerves-dl-${{ inputs.toolchain }}-darwin-
nerves-dl-${{ inputs.toolchain }}-
nerves-dl-${{ hashFiles('toolchain_config.exs', 'configs/**/defconfig', 'template/defaults/*_defconfig') }}-
nerves-dl-

- name: Build toolchain
run: bash ${{ inputs.toolchain }}/build.sh "$GITHUB_WORKSPACE/o/${{ inputs.toolchain }}"
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_aarch64_nerves_linux_gnu/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_ARM=y
CT_ARCH_64=y
CT_KERNEL_LINUX=y
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_aarch64_nerves_linux_musl/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_ARM=y
CT_ARCH_64=y
CT_KERNEL_LINUX=y
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_armv5_nerves_linux_musleabi/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_ARM=y
CT_ARCH_TUNE="arm926ej-s"
CT_ARCH_SUFFIX="v5"
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_armv6_nerves_linux_gnueabihf/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_ARM=y
CT_ARCH_CPU="arm1176jzf-s"
CT_ARCH_SUFFIX="v6"
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_armv7_nerves_linux_gnueabihf/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_ARM=y
CT_ARCH_CPU="generic-armv7-a"
CT_ARCH_SUFFIX="v7"
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_armv7_nerves_linux_musleabihf/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_ARM=y
CT_ARCH_CPU="generic-armv7-a"
CT_ARCH_SUFFIX="v7"
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_i586_nerves_linux_gnu/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_X86=y
CT_ARCH_ARCH="i586"
CT_KERNEL_LINUX=y
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_mipsel_nerves_linux_musl/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_MIPS=y
CT_ARCH_LE=y
CT_ARCH_ARCH="24kec"
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_riscv64_nerves_linux_gnu/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_RISCV=y
CT_MULTILIB=y
CT_ARCH_USE_MMU=y
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_riscv64_nerves_linux_musl/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_RISCV=y
CT_ARCH_USE_MMU=y
CT_ARCH_64=y
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_x86_64_nerves_linux_gnu/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_X86=y
CT_ARCH_64=y
CT_KERNEL_LINUX=y
Expand Down
2 changes: 1 addition & 1 deletion configs/nerves_toolchain_x86_64_nerves_linux_musl/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${CT_TOP_DIR}/../dl"
CT_LOCAL_TARBALLS_DIR="${HOME}/.nerves/dl"
CT_ARCH_X86=y
CT_ARCH_64=y
CT_KERNEL_LINUX=y
Expand Down
9 changes: 6 additions & 3 deletions template/build.sh.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ if [[ -z $HOST_OS ]]; then
HOST_OS=$BUILD_OS
fi

ARTIFACT_HOST_ARCH=$HOST_ARCH
if [[ $HOST_OS = "darwin" && ( $HOST_ARCH = "arm64" || $HOST_ARCH = "aarch64" ) ]]; then
ARTIFACT_HOST_ARCH="arm"
fi

if [[ ! -e $BASE_CONFIG ]]; then
echo "Can't find $BASE_CONFIG. Check that it exists."
echo
Expand Down Expand Up @@ -99,7 +104,7 @@ fi

PACKAGE_CHECKSUM=$(elixir "$CHECKSUM_SCRIPT" "$MIX_FILE")
TOOLCHAIN_NAME=$(basename "$CTNG_CONFIG_DIR")
ARTIFACT_BASENAME="$TOOLCHAIN_NAME-${HOST_OS}_${HOST_ARCH}-$NERVES_TOOLCHAIN_VERSION-$PACKAGE_CHECKSUM.tar.xz"
ARTIFACT_BASENAME="$TOOLCHAIN_NAME-${HOST_OS}_${ARTIFACT_HOST_ARCH}-$NERVES_TOOLCHAIN_VERSION-$PACKAGE_CHECKSUM.tar.xz"
ARTIFACT_PATH="$OUTPUT_DIR/$ARTIFACT_BASENAME"

echo "Using HOST_ARCH: $HOST_ARCH"
Expand Down Expand Up @@ -233,7 +238,6 @@ build_gcc()
{
# Build and install ct-ng to the work directory
cd "$WORK_DIR"
ln -sf "$DL_DIR" dl
rm -fr crosstool-ng crosstool-ng-*

CTNG_TAR_XZ=crosstool-ng-$CTNG_TAG.tar.xz
Expand Down Expand Up @@ -317,7 +321,6 @@ build_gcc()
-e 's/^.*\(CT_LOG_DEBUG\).*$/# \1 is not set/' \
-e 's/^.*\(CT_LOG_LEVEL_MAX\).*$/\1="EXTRA"/' \
-e 's/^.*\(CT_LOG_PROGRESS_BAR\).*$/# \1 is not set/' \
-e 's/^.*\(CT_LOCAL_TARBALLS_DIR\).*$/\1="${HOME}\/src"/' \
-e 's/^.*\(CT_SAVE_TARBALLS\).*$/\1=y/' \
"$WORK_DIR/build/.config"
fi
Expand Down
Loading