Skip to content

Commit

Permalink
Bumped NX to 20231108. Added ref_name to docker tags.
Browse files Browse the repository at this point in the history
  • Loading branch information
kfprimm committed Nov 26, 2023
1 parent e442161 commit 488f22e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: docker/build-push-action@v2
with:
file: Dockerfile.${{ matrix.platform }}
tags: ghcr.io/blitz3d-ng/env:${{ matrix.platform }}
tags: ghcr.io/blitz3d-ng/env:${{ matrix.platform }}-${{ github.ref_name }}
pull: true
push: true

Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
uses: docker/build-push-action@v2
with:
file: Dockerfile.${{ matrix.platform }}
tags: ghcr.io/blitz3d-ng/env:${{ matrix.platform }}
tags: ghcr.io/blitz3d-ng/env:${{ matrix.platform }}-${{ github.ref_name }}
pull: true
push: true

Expand Down
9 changes: 1 addition & 8 deletions Dockerfile.nx
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
##
# A basic devkitPro environment for compiling to Nintendo Switch.

FROM devkitpro/devkita64:20210726 AS devkitpro

# some of the provided libs conflict with ours
RUN rm -r /opt/devkitpro/portlibs/switch/include/freetype2
RUN rm -r /opt/devkitpro/portlibs/switch/include/ode
FROM devkitpro/devkita64:20231108 AS devkitpro

FROM ghcr.io/blitz3d-ng/env:debian-11 AS build

COPY --from=devkitpro /opt/devkitpro /opt/devkitpro

RUN apt-get update && apt-get upgrade -y && \
apt-get install -y clang

0 comments on commit 488f22e

Please sign in to comment.