diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 2a8d7214f..26fb5816c 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -25,7 +25,3 @@ jobs: uses: ./.github/workflows/container.yml with: name: 'ubuntu' - idoc: - uses: ./.github/workflows/container.yml - with: - name: 'idoc' diff --git a/ci/docker/fedora/Dockerfile b/ci/docker/fedora/Dockerfile index ecdb24bfa..da086b0bf 100644 --- a/ci/docker/fedora/Dockerfile +++ b/ci/docker/fedora/Dockerfile @@ -15,3 +15,9 @@ RUN sudo dnf install --assumeyes --quiet gcc make tar git rustup rclone \ RUN rustup-init --quiet -y --no-modify-path --profile minimal \ --component clippy,rustfmt --default-toolchain $RUST_VERSION + +# idoc targets the latest stable release of Inko, but our tests run against a +# newer version. This allows us to use an existing idoc executable without +# having to compile it ourselves. +COPY --from=ghcr.io/inko-lang/idoc:latest ["/usr/bin/idoc", "/usr/bin/idoc"] +COPY --from=ghcr.io/inko-lang/idoc:latest ["/usr/share/idoc/assets", "/usr/share/idoc/assets"] diff --git a/ci/docker/idoc/Dockerfile b/ci/docker/idoc/Dockerfile deleted file mode 100644 index 2eaa7e9a2..000000000 --- a/ci/docker/idoc/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM ghcr.io/inko-lang/idoc:latest -RUN microdnf install --quiet --assumeyes rclone git tar make