Skip to content

Commit

Permalink
Rename checked-runtime image to checked-jit
Browse files Browse the repository at this point in the history
  • Loading branch information
KubaZ2 committed Oct 11, 2024
1 parent e32ec7c commit fd025d9
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,33 +70,33 @@ jobs:
*.cache-from=type=gha
*.cache-to=type=gha,mode=min
- name: Check if checked runtime changed
- name: Check if checked jit might have changed
uses: dorny/paths-filter@v3
id: checkedruntime
id: checked-jit
with:
filters: |
checkedruntime:
- 'Backend/Sandbox/CheckedRuntime/**'
checked-jit:
- 'Backend/Sandbox/CheckedJit/**'
- '.github/workflows/**'
- name: Set MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64
if: steps.checkedruntime.outputs.checkedruntime == 'true'
if: steps.checked-jit.outputs.checked-jit == 'true'
run: |
MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64=${{ runner.arch != 'X64' && format('-{0}', runner.arch) || '' }}
echo "MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64=${MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64,,}" >>${GITHUB_ENV}
- name: Build and push checked runtime
if: steps.checkedruntime.outputs.checkedruntime == 'true'
- name: Build and push runtime with checked jit
if: steps.checked-jit.outputs.checked-jit == 'true'
uses: docker/bake-action@v5
with:
source: .
workdir: Backend/Sandbox/CheckedRuntime
workdir: Backend/Sandbox/CheckedJit
push: true
set: |
*.platform=linux/amd64,linux/arm64
*.cache-from=type=gha
*.cache-to=type=gha,mode=min
checked-runtime.args.MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64=${{ env.MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64 }}
checked-jit.args.MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64=${{ env.MINUS_PREFIXED_PLATFORM_IF_NOT_AMD64 }}
- name: Build and push backend
uses: docker/bake-action@v5
Expand Down
6 changes: 3 additions & 3 deletions Backend/Sandbox/Asm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ COPY Backend/Sandbox/Asm Backend/Sandbox/Asm

RUN dotnet publish Backend/Sandbox/Asm/Asm.csproj -c Release -o /app

# 'docker buildx use default' is needed to use local 'ghcr.io/kubaz2/sharp/checked-runtime' image
FROM ghcr.io/kubaz2/sharp/checked-runtime:$DOTNET_RUNTIME_VERSION AS checked-runtime
# 'docker buildx use default' is needed to use local 'ghcr.io/kubaz2/sharp/checked-jit' image
FROM ghcr.io/kubaz2/sharp/checked-jit:$DOTNET_RUNTIME_VERSION AS checked-jit

FROM mcr.microsoft.com/dotnet/runtime:$DOTNET_RUNTIME_VERSION-$OS_CODENAME AS runtime
ARG DOTNET_RUNTIME_VERSION

COPY --from=build-env /app /app

COPY --from=checked-runtime /runtime/libclrjit.so /usr/share/dotnet/shared/Microsoft.NETCore.App/$DOTNET_RUNTIME_VERSION/
COPY --from=checked-jit /runtime/libclrjit.so /usr/share/dotnet/shared/Microsoft.NETCore.App/$DOTNET_RUNTIME_VERSION/

FROM pwn.red/jail

Expand Down
File renamed without changes.
6 changes: 6 additions & 0 deletions Backend/Sandbox/CheckedJit/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
services:
checked-jit:
build:
context: .
dockerfile: Dockerfile
image: ghcr.io/kubaz2/sharp/checked-jit:8.0.7
6 changes: 0 additions & 6 deletions Backend/Sandbox/CheckedRuntime/docker-compose.yml

This file was deleted.

6 changes: 3 additions & 3 deletions Sharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mobius.ILasm", "Bot\Mobius.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharp.Runtime", "Sharp.Runtime\Sharp.Runtime.csproj", "{AF8C0407-4D7C-4DAE-9155-D4A784A621BA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CheckedRuntime", "CheckedRuntime", "{451D9195-4B8F-4FE7-ACA3-49393B72D46C}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CheckedJit", "CheckedJit", "{451D9195-4B8F-4FE7-ACA3-49393B72D46C}"
ProjectSection(SolutionItems) = preProject
Backend\Sandbox\CheckedRuntime\Dockerfile = Backend\Sandbox\CheckedRuntime\Dockerfile
Backend\Sandbox\CheckedRuntime\docker-compose.yml = Backend\Sandbox\CheckedRuntime\docker-compose.yml
Backend\Sandbox\CheckedJit\Dockerfile = Backend\Sandbox\CheckedJit\Dockerfile
Backend\Sandbox\CheckedJit\docker-compose.yml = Backend\Sandbox\CheckedJit\docker-compose.yml
EndProjectSection
EndProject
Global
Expand Down

0 comments on commit fd025d9

Please sign in to comment.