From 5515d12eddead711af10d53b2572a3aa1d9d6dac Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Wed, 14 Feb 2024 18:13:08 -0500
Subject: [PATCH] make gitlab CI work for conduwuit
Signed-off-by: strawberry <strawberry@puppygock.gay>
---
.gitlab-ci.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 639319c5..b7c101e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,7 +112,6 @@ debian:x86_64-unknown-linux-gnu:
# See also `rust-toolchain.toml`
image: rust:1.75.0
script:
- - apt-get update && apt-get install -y --no-install-recommends libclang-dev
- cargo install cargo-deb
- cargo deb
@@ -133,16 +132,16 @@ docker-publish:
services:
- docker:25.0.0-dind
variables:
- IMAGE_NAME: $CI_REGISTRY_IMAGE/matrix-conduit
+ IMAGE_NAME: $CI_REGISTRY_IMAGE/conduwuit
IMAGE_SUFFIX_AMD64: amd64
IMAGE_SUFFIX_ARM64V8: arm64v8
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
- docker load -i oci-image-amd64.tar.gz
- - IMAGE_ID_AMD64=$(docker images -q conduit:next)
+ - IMAGE_ID_AMD64=$(docker images -q conduit:main)
- docker load -i oci-image-arm64v8.tar.gz
- - IMAGE_ID_ARM64V8=$(docker images -q conduit:next)
+ - IMAGE_ID_ARM64V8=$(docker images -q conduit:main)
# Tag and push the architecture specific images
- docker tag $IMAGE_ID_AMD64 $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64
- docker tag $IMAGE_ID_ARM64V8 $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
@@ -164,6 +163,5 @@ docker-publish:
- oci-image:x86_64-unknown-linux-gnu
- oci-image:aarch64-unknown-linux-musl
only:
- - next
- - master
+ - main
- tags