From 4db6bc6da502d3a445cdd58c47b64cbeaeb6cc87 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 1 Mar 2023 11:22:31 -0700
Subject: [PATCH] Simplify Redox CI
---
.gitlab-ci.yml | 33 ++-------------------------------
1 file changed, 2 insertions(+), 31 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dab973fa9..41ca6ac44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,42 +1,13 @@
-image: "ubuntu:20.04"
+image: "ubuntu:22.04"
variables:
- GIT_STRATEGY: "pull"
GIT_SUBMODULE_STRATEGY: "recursive"
- GIT_CHECKOUT: "true"
-
-before_script:
- - |
- export DEBIAN_FRONTEND=noninteractive
- apt-get update -qq &&
- apt-get install -qq \
- bison \
- build-essential \
- curl \
- dosfstools \
- flex \
- fuse \
- genisoimage \
- git \
- gnupg \
- libfuse-dev \
- nasm \
- parted \
- pkg-config \
- software-properties-common \
- syslinux \
- syslinux-utils \
- texinfo \
- wget &&
- curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
img:
script:
- |
+ ./bootstrap -d &&
source "$HOME/.cargo/env" &&
- cargo install --version 0.1.1 cargo-config &&
- cargo install cargo-xbuild &&
- cargo install --version 0.3.20 xargo &&
make ci-img IMG_TAG=$CI_COMMIT_REF_NAME
artifacts:
paths:
--
GitLab