Skip to content

Commit 31b3fb3

Browse files
committed
Replace ML stack with shiny for rocker builds
1 parent 33027ed commit 31b3fb3

File tree

1 file changed

+6
-42
lines changed

1 file changed

+6
-42
lines changed

.github/workflows/rocker-builds.yaml

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,12 @@ jobs:
220220
tags: ${{ steps.defs.outputs.rockerintermediateprefix }}-tidyverse:${{ steps.defs.outputs.rver }}-${{ matrix.build.arch }}
221221
platforms: linux/${{ matrix.build.arch }}
222222

223-
mlbuild:
223+
buildshiny:
224224
strategy:
225225
matrix:
226226
build:
227227
- { arch: 'amd64', runner: 'ubuntu-latest' }
228+
- { arch: 'arm64', runner: 'ubuntu-latest-arm64' }
228229
runs-on: ${{ matrix.build.runner }}
229230
steps:
230231
- uses: actions/checkout@v3
@@ -250,55 +251,18 @@ jobs:
250251
password: ${{ secrets.GITHUB_TOKEN }}
251252

252253
- name: Prep rocker rocker files
253-
run: |
254-
## git clone rocker
255-
git clone --depth 1 https://github.com/rocker-org/rocker-versioned2
256-
sed -i 's#11.8.0-cudnn8-devel-ubuntu22.04#12.6.2-cudnn-devel-ubuntu24.04#g' rocker-versioned2/dockerfiles/cuda_${{ steps.defs.outputs.rver }}.Dockerfile
257-
sed -i 's#11.8.0-cudnn8-devel-ubuntu22.04#12.6.2-cudnn-devel-ubuntu24.04#g' rocker-versioned2/dockerfiles/ml_${{ steps.defs.outputs.rver }}.Dockerfile
258-
sed -i 's#11.8.0-cudnn8-devel-ubuntu22.04#12.6.2-cudnn-devel-ubuntu24.04#g' rocker-versioned2/dockerfiles/ml-verse_${{ steps.defs.outputs.rver }}.Dockerfile
259-
260-
# Package archived from CRAN
261-
sed -i '/rmdshower/d' rocker-versioned2/scripts/install_verse.sh
262-
263-
sed -i 's#rocker/cuda:${{ steps.defs.outputs.rver }}#${{ steps.defs.outputs.rockerintermediateprefix }}-cuda:${{ steps.defs.outputs.rver }}-${{ matrix.build.arch }}#g' rocker-versioned2/dockerfiles/ml_${{ steps.defs.outputs.rver }}.Dockerfile
264-
sed -i 's#rocker/ml:${{ steps.defs.outputs.rver }}#${{ steps.defs.outputs.rockerintermediateprefix }}-ml:${{ steps.defs.outputs.rver }}-${{ matrix.build.arch }}#g' rocker-versioned2/dockerfiles/ml-verse_${{ steps.defs.outputs.rver }}.Dockerfile
265-
266-
echo "Bioconductor Version: ${{ steps.defs.outputs.biocver }}"
267-
if [ "${{ steps.defs.outputs.rver }}" == "devel" ]; then
268-
bash .github/scripts/devel_or_patched_rversion.sh "${{ steps.defs.outputs.biocver }}" "rocker-versioned2/dockerfiles/cuda_${{ steps.defs.outputs.rver }}.Dockerfile"
269-
bash .github/scripts/devel_or_patched_rversion.sh "${{ steps.defs.outputs.biocver }}" "rocker-versioned2/dockerfiles/ml_${{ steps.defs.outputs.rver }}.Dockerfile"
270-
bash .github/scripts/devel_or_patched_rversion.sh "${{ steps.defs.outputs.biocver }}" "rocker-versioned2/dockerfiles/ml-verse_${{ steps.defs.outputs.rver }}.Dockerfile"
271-
fi
254+
run: bash .github/scripts/rocker_prep.sh ${{ steps.defs.outputs.rver }} ${{ steps.defs.outputs.biocver }} ${{ steps.defs.outputs.rockerintermediateprefix }} ${{ matrix.build.arch }}
272255

273256
- name: Set up Docker Buildx
274257
uses: docker/setup-buildx-action@v2
275258
with:
276259
platforms: linux/${{ matrix.build.arch }}
277260

278-
- name: Build and load cuda
261+
- name: Build and push shiny
279262
uses: docker/build-push-action@v3
280263
with:
281-
file: rocker-versioned2/dockerfiles/cuda_${{ steps.defs.outputs.rver }}.Dockerfile
264+
file: rocker-versioned2/dockerfiles/shiny_${{ steps.defs.outputs.rver }}.Dockerfile
282265
context: rocker-versioned2
283266
push: true
284-
tags: ${{ steps.defs.outputs.rockerintermediateprefix }}-cuda:${{ steps.defs.outputs.rver }}-${{ matrix.build.arch }}
267+
tags: ${{ steps.defs.outputs.rockerintermediateprefix }}-shiny:${{ steps.defs.outputs.rver }}-${{ matrix.build.arch }}
285268
platforms: linux/${{ matrix.build.arch }}
286-
287-
- name: Build and load ml
288-
uses: docker/build-push-action@v3
289-
with:
290-
file: rocker-versioned2/dockerfiles/ml_${{ steps.defs.outputs.rver }}.Dockerfile
291-
context: rocker-versioned2
292-
push: true
293-
tags: ${{ steps.defs.outputs.rockerintermediateprefix }}-ml:${{ steps.defs.outputs.rver }}-${{ matrix.build.arch }}
294-
platforms: linux/${{ matrix.build.arch }}
295-
296-
- name: Build and load ml-verse
297-
uses: docker/build-push-action@v3
298-
with:
299-
file: rocker-versioned2/dockerfiles/ml-verse_${{ steps.defs.outputs.rver }}.Dockerfile
300-
context: rocker-versioned2
301-
push: true
302-
tags: ${{ steps.defs.outputs.rockerintermediateprefix }}-ml-verse:${{ steps.defs.outputs.rver }}-${{ matrix.build.arch }}
303-
platforms: linux/${{ matrix.build.arch }}
304-

0 commit comments

Comments
 (0)