From 4bc141dab1badae70f3d3387702d23027df89467 Mon Sep 17 00:00:00 2001 From: FantasyPvP <80643031+FantasyPvP@users.noreply.github.com> Date: Wed, 29 Nov 2023 00:16:52 +0000 Subject: [PATCH 1/5] Update rust.yml --- .github/workflows/rust.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index af0cdb7..eb19cf6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -11,10 +11,9 @@ env: jobs: build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Build - run: cargo build --verbose + container: + image: ghcr.io/fantasypvp/crystalos_builder:latest + credentials: + username: FantasyPvP + password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} From c70d3eb4550e40649cf96f75baeb8404d92fe2c5 Mon Sep 17 00:00:00 2001 From: FantasyPvP <80643031+FantasyPvP@users.noreply.github.com> Date: Wed, 29 Nov 2023 00:20:04 +0000 Subject: [PATCH 2/5] Update rust.yml --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index eb19cf6..a54061e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,3 +17,5 @@ jobs: credentials: username: FantasyPvP password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} + steps: + run: cargo run --release From a3c9481e5d7fff3d692e2f722e5255a9077a9c14 Mon Sep 17 00:00:00 2001 From: FantasyPvP <80643031+FantasyPvP@users.noreply.github.com> Date: Wed, 29 Nov 2023 00:20:28 +0000 Subject: [PATCH 3/5] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a54061e..f37c1c8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,4 +18,4 @@ jobs: username: FantasyPvP password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} steps: - run: cargo run --release + - run: cargo run --release From 47b81f1eeddbd88a8d8ba3e4766351aafdd9beb5 Mon Sep 17 00:00:00 2001 From: FantasyPvP <80643031+FantasyPvP@users.noreply.github.com> Date: Wed, 29 Nov 2023 00:24:43 +0000 Subject: [PATCH 4/5] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index f37c1c8..ce834f8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,4 +18,4 @@ jobs: username: FantasyPvP password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} steps: - - run: cargo run --release + - run: cargo build --release From ba21816f757546e4613c918d51f8226cd83e451c Mon Sep 17 00:00:00 2001 From: FantasyPvP <80643031+FantasyPvP@users.noreply.github.com> Date: Wed, 29 Nov 2023 23:42:23 +0000 Subject: [PATCH 5/5] Create Dockerfile --- Dockerfile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..0a3d0ff --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM ubuntu:latest + +RUN apt-get update && apt-get install -y curl +RUN apt-get install build-essential -y + +RUN mkdir /src +WORKDIR /src + +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y +ENV PATH="/root/.cargo/bin:${PATH}" + +RUN rustup toolchain install nightly +RUN rustup install nightly-2023-08-18 +RUN rustup override set nightly +RUN rustup default nightly +RUN rustup component add llvm-tools-preview --toolchain nightly-x86_64-unknown-linux-gnu +RUN rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu +RUN cargo install bootimage + +COPY . . + +RUN cargo update -p proc-macro2