Skip to content

Commit dadd3d3

Browse files
committed
ci: remove workaround for Xtensa environment
With [38] tentatively in (through a branched action), [491] can be reverted; the latter had doing something like [38] in its list of considered alternatives, but failed to foresee the need for sourcing all that data back in for compiling C code on Xtensa. [38]: esp-rs/xtensa-toolchain#38 [491]: ariel-os#491
1 parent 6c5e486 commit dadd3d3

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,6 @@ jobs:
7979
override: false
8080
export: false
8181

82-
- name: Keep general build environment clean of Xtensa peculiarities
83-
if: steps.result-cache.outputs.cache-hit != 'true'
84-
# The Xtensa setup unconditionally sets LIBCLANG_PATH in GITHUB_ENV --
85-
# we can't undo that. (It also sets it in ~/exports, but that is just
86-
# what it uses internally to get that data around into the action
87-
# script)
88-
#
89-
# As the shell apparently does not source any files, and until
90-
# https://github.com/actions/runner/issues/1126 is fixed by GitHub, the
91-
# best remedy is to stow the workaround and source it wherever we can.
92-
run: |
93-
set -x
94-
echo 'unset LIBCLANG_PATH' >> ~/source-this-first.sh
95-
9682
- name: rust cache
9783
if: steps.result-cache.outputs.cache-hit != 'true'
9884
uses: Swatinem/rust-cache@v2
@@ -107,7 +93,6 @@ jobs:
10793
- name: "installing prerequisites"
10894
if: steps.result-cache.outputs.cache-hit != 'true'
10995
run: |
110-
source ~/source-this-first.sh
11196
git config --global init.defaultBranch main
11297
git config --global user.email "ci@riot-labs.de"
11398
git config --global user.name "CI"
@@ -134,13 +119,11 @@ jobs:
134119
- name: "limit build unless nightly build"
135120
if: github.event_name != 'schedule' && steps.result-cache.outputs.cache-hit != 'true'
136121
run: |
137-
source ~/source-this-first.sh
138122
echo "LAZE_BUILDERS=ai-c3,espressif-esp32-c6-devkitc-1,espressif-esp32-s3-devkitc-1,bbc-microbit-v2,nrf52840dk,nrf5340dk,rpi-pico,rpi-pico-w,st-nucleo-h755zi-q,st-nucleo-wb55" >> "$GITHUB_ENV"
139123
140124
- name: "ariel-os compilation test"
141125
if: steps.result-cache.outputs.cache-hit != 'true'
142126
run: |
143-
source ~/source-this-first.sh
144127
sccache --start-server || true # work around https://github.com/ninja-build/ninja/issues/2052
145128
146129
CONFIG_WIFI_NETWORK='test' CONFIG_WIFI_PASSWORD='password' laze build --global --partition hash:${{ matrix.partition }}

0 commit comments

Comments
 (0)