Skip to content

Commit 4b5f251

Browse files
committed
Stop installing aoc on the CI runner images
1 parent 1239fd7 commit 4b5f251

File tree

9 files changed

+1
-90
lines changed

9 files changed

+1
-90
lines changed

.github/workflows/build-windows.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,23 +140,6 @@ jobs:
140140
cd build
141141
ninja -v -k0
142142
143-
- name: cache aocl
144-
id: cache-aocl
145-
uses: actions/cache@v4
146-
with:
147-
path: c:\aocl
148-
key: aocl-${{ hashFiles('.github/workflows/build-windows.yml', 'scripts/install_aocl.ps1') }}
149-
150-
- name: install aocl
151-
if: ${{ !steps.cache-aocl.outputs.cache-hit }}
152-
run: pwsh .\scripts\install_aocl.ps1 -installdir C:\aocl
153-
154-
- name: add aocl to path
155-
run: echo c:\aocl\hld\bin | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
156-
157-
- name: query aocl version
158-
run: aoc -version
159-
160143
- name: test runtime
161144
run: |
162145
cd build

.github/workflows/container.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ on:
3636
- 'container/opensuse-leap-15-dev/**'
3737
- 'container/ubuntu-20.04-dev/**'
3838
- 'container/ubuntu-22.04-dev/**'
39-
- 'scripts/install_aocl.sh'
4039

4140
pull_request:
4241
paths:
@@ -47,7 +46,6 @@ on:
4746
- 'container/opensuse-leap-15-dev/**'
4847
- 'container/ubuntu-20.04-dev/**'
4948
- 'container/ubuntu-22.04-dev/**'
50-
- 'scripts/install_aocl.sh'
5149

5250
workflow_dispatch:
5351

container/opensuse-leap-15-dev/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,9 @@ RUN zypper -n update \
3636
which \
3737
zlib-devel \
3838
&& zypper -n clean \
39-
&& ./install_aocl.sh /opt/aocl \
4039
&& useradd --system ${uid:+--uid "$uid"} --user-group --shell /sbin/nologin --create-home --home-dir /home/build build \
4140
&& echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/build \
4241
&& rm -rf "$PWD"
4342

4443
USER build
4544
WORKDIR /home/build
46-
47-
ENV PATH="/opt/aocl/hld/bin:$PATH"
48-
# Workaround for libnsl.so.1 not installed by default on the latest OpenSUSE image
49-
RUN mkdir -p /tmp/aoc && ln -snf /usr/lib64/libnsl.so.2.0.0 /tmp/aoc/libnsl.so.1
50-
ENV LD_LIBRARY_PATH="/tmp/aoc:$LD_LIBRARY_PATH"
51-
RUN aoc -version

container/rockylinux-8-dev/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,9 @@ RUN \
4141
which \
4242
zlib-devel \
4343
&& yum -y clean all \
44-
&& ./install_aocl.sh /opt/aocl \
4544
&& useradd --system ${uid:+--uid "$uid"} --user-group --shell /sbin/nologin --create-home --home-dir /home/build build \
4645
&& echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/build \
4746
&& rm -rf "$PWD"
4847

4948
USER build
5049
WORKDIR /home/build
51-
52-
ENV PATH="/opt/aocl/hld/bin:$PATH"
53-
RUN aoc -version

container/rockylinux-9-dev/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,9 @@ RUN \
4444
which \
4545
zlib-devel \
4646
&& yum -y clean all \
47-
&& ./install_aocl.sh /opt/aocl \
4847
&& useradd --system ${uid:+--uid "$uid"} --user-group --shell /sbin/nologin --create-home --home-dir /home/build build \
4948
&& echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/build \
5049
&& rm -rf "$PWD"
5150

5251
USER build
5352
WORKDIR /home/build
54-
55-
ENV PATH="/opt/aocl/hld/bin:$PATH"
56-
RUN aoc -version

container/ubuntu-20.04-dev/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ RUN apt-get -y update \
3232
sudo \
3333
zlib1g-dev \
3434
&& apt-get -y clean \
35-
&& ./install_aocl.sh /opt/aocl \
3635
&& useradd --system ${uid:+--uid "$uid"} --user-group --shell /sbin/nologin --create-home --home-dir /home/build build \
3736
&& echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/build \
3837
&& rm -rf "$PWD"
3938

4039
USER build
4140
WORKDIR /home/build
42-
43-
ENV PATH="/opt/aocl/hld/bin:$PATH"
44-
RUN aoc -version

container/ubuntu-22.04-dev/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,12 @@ RUN apt-get -y update \
4040
sudo \
4141
zlib1g-dev \
4242
&& apt-get -y clean \
43-
&& ./install_aocl.sh /opt/aocl \
4443
&& useradd --system ${uid:+--uid "$uid"} --user-group --shell /sbin/nologin --create-home --home-dir /home/build build \
4544
&& echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/build \
4645
&& rm -rf "$PWD"
4746

4847
USER build
4948
WORKDIR /home/build
5049

51-
ENV PATH="/opt/aocl/hld/bin:/usr/lib/llvm-13/bin:$PATH"
52-
RUN aoc -version
50+
ENV PATH="/usr/lib/llvm-13/bin:$PATH"
5351
RUN clang-format --version

scripts/install_aocl.ps1

Lines changed: 0 additions & 28 deletions
This file was deleted.

scripts/install_aocl.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)