mirror of
https://github.com/input-output-hk/devx.git
synced 2024-09-11 04:15:30 +03:00
Fix codespace-upload
action that wrongly name devx-containers
(#143)
e.g. `x86_64-linux.ghc96-jsfalse` rather than `x86_64-linux.ghc96-js` ...
This commit is contained in:
parent
25aa06c5ee
commit
c212848a31
6
.github/workflows/wait-and-upload.yml
vendored
6
.github/workflows/wait-and-upload.yml
vendored
@ -21,7 +21,7 @@ on:
|
||||
default: true
|
||||
iog:
|
||||
description: 'with iog libs: libsodium, libsecp256k1, libblst, ...'
|
||||
type: boolean
|
||||
type: boolean # FIXME: this should rather be a 'string' that could be set to 'full' ...
|
||||
default: false
|
||||
iog-full:
|
||||
description: 'with full iog libs: libsodium, libsecp256k1, libblst, postgresql, R, ...'
|
||||
@ -120,7 +120,7 @@ jobs:
|
||||
# Likely, we consider using `-iog` as the default and do not generate other images.
|
||||
# Then the user choices left would be between native, `-windows` or `-js` target platforms,
|
||||
# and the GHC version (currently `ghc810` and `ghc96`).
|
||||
if: ${{ contains(fromJSON('["x86_64-linux", "aarch64-linux"]'), inputs.platform) && contains(fromJson('["","-windows","-js"]'), inputs.target-platform) && contains(fromJson('["ghc810","ghc96"]'), inputs.compiler-nix-name) && !inputs.minimal }}
|
||||
if: ${{ contains(fromJSON('["x86_64-linux", "aarch64-linux"]'), inputs.platform) && contains(fromJson('["","-windows","-js"]'), inputs.target-platform) && contains(fromJson('["ghc810","ghc96"]'), inputs.compiler-nix-name) && !inputs.minimal && inputs.iog && !inputs.iog-full }}
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
@ -137,7 +137,7 @@ jobs:
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.platform }}.${{ inputs.compiler-nix-name }}${{ inputs.target-platform }}${{ inputs.iog-full || inputs.iog }}
|
||||
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.platform }}.${{ inputs.compiler-nix-name }}${{ inputs.target-platform }}${{ (inputs.iog-full && '-iog-full') || (inputs.iog && '-iog') }}
|
||||
build-args: |
|
||||
PLATFORM=${{ inputs.platform }}
|
||||
TARGET_PLATFORM=${{ inputs.target-platform }}
|
||||
|
@ -6,6 +6,7 @@ ARG TARGET_PLATFORM=""
|
||||
ARG COMPILER_NIX_NAME="ghc96"
|
||||
ARG MINIMAL="false"
|
||||
ARG IOG="true"
|
||||
ARG IOG_FULL="false"
|
||||
|
||||
RUN DEBIAN_FRONTEND=noninteractive \
|
||||
&& apt-get update \
|
||||
@ -15,7 +16,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
|
||||
&& SUFFIX='' \
|
||||
&& if [ "$MINIMAL" = "true" ]; then SUFFIX="${SUFFIX}-minimal"; fi \
|
||||
&& if [ "$IOG" = "true" ]; then SUFFIX="${SUFFIX}-iog"; fi \
|
||||
&& if [ "$IOG_FULL" = "true" ]; then SUFFIX="${SUFFIX}-iog-full"; fi \
|
||||
&& if [ "$IOG_FULL" = "true" ]; then SUFFIX="${SUFFIX}-full"; fi \
|
||||
&& ./fetch-docker.sh input-output-hk/devx $PLATFORM.$COMPILER_NIX_NAME$TARGET_PLATFORM${SUFFIX}-env | zstd -d | nix-store --import | tee store-paths.txt
|
||||
|
||||
RUN cat <<EOF >> $HOME/.bashrc
|
||||
|
Loading…
Reference in New Issue
Block a user