From 36681dd3acdca1eb716c689aa87f8d45a1b022a0 Mon Sep 17 00:00:00 2001
From: Jonas Zohren <gitlab-jfowl-0ux98@sh14.de>
Date: Sun, 11 Jul 2021 11:43:48 +0000
Subject: [PATCH] Fix: Duplicate releases don't work, remove nightly
---
.gitlab-ci.yml | 35 ++++-------------------------------
DEPLOY.md | 16 ++++++++++++----
2 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66cdf5c5..005f0ee9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,7 @@
stages:
- test
- build
- - publish artifacts
- - release nightly
+ - upload artifacts
variables:
GIT_SUBMODULE_STRATEGY: recursive
@@ -137,11 +136,11 @@ build:cargo-deb:x86_64-unknown-linux-gnu:
# --------------------------------------------------------------------- #
-# Storing and releasing compiled binaries #
+# Store binaries as package so they have download urls #
# --------------------------------------------------------------------- #
publish:package:
- stage: "publish artifacts"
+ stage: "upload artifacts"
needs:
- "build:cargo:x86_64-unknown-linux-gnu"
- "build:cargo:armv7-unknown-linux-gnueabihf"
@@ -159,30 +158,4 @@ publish:package:
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file conduit-aarch64-unknown-linux-gnu "${BASE_URL}/conduit-aarch64-unknown-linux-gnu"'
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file conduit-x86_64-unknown-linux-gnu.deb "${BASE_URL}/conduit-x86_64-unknown-linux-gnu.deb"'
-
-
-publish:nightly:
- stage: "release nightly"
- image: registry.gitlab.com/gitlab-org/release-cli:latest
- needs:
- - job: "publish:package"
- artifacts: false
- variables:
- GIT_STRATEGY: "none" # Don't need a clean copy of the code, we just operate on artifacts
- script: "echo 'Releasing current state as release'"
- rules:
- - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH" # Run this job on the main branch
- release:
- name: 'Nightly'
- description: '⚠️ The latest development version of the day, fresh from the repository. Use at your own risk!'
- tag_name: 'nightly'
- assets:
- links:
- - name: 'conduit-x86_64-unknown-linux-gnu'
- url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/conduit-${CI_COMMIT_REF_SLUG}/build-${CI_PIPELINE_ID}/conduit-x86_64-unknown-linux-gnu"
- - name: 'conduit-armv7-unknown-linux-gnueabihf'
- url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/conduit-${CI_COMMIT_REF_SLUG}/build-${CI_PIPELINE_ID}/conduit-armv7-unknown-linux-gnueabihf"
- - name: 'conduit-aarch64-unknown-linux-gnu'
- url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/conduit-${CI_COMMIT_REF_SLUG}/build-${CI_PIPELINE_ID}/conduit-aarch64-unknown-linux-gnu"
- - name: 'conduit-x86_64-unknown-linux-gnu.deb'
- url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/conduit-${CI_COMMIT_REF_SLUG}/build-${CI_PIPELINE_ID}/conduit-x86_64-unknown-linux-gnu.deb"
+
diff --git a/DEPLOY.md b/DEPLOY.md
index fe8c331b..778d0e08 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -8,10 +8,18 @@ If you run into any problems while setting up Conduit, write an email to `timo@k
You may simply download the binary that fits your machine. Run `uname -m` to see
what you need. Now copy the right url:
-- x84_64: `https://conduit.rs/master/x86_64/conduit-bin`
-- armv7: `https://conduit.rs/master/armv7/conduit-bin`
-- armv8: `https://conduit.rs/master/armv8/conduit-bin`
-- arm: `https://conduit.rs/master/arm/conduit-bin`
+
+| CPU Architecture | GNU (Debian, ArchLinux, ...) | MUSL (Alpine, ... ) |
+| ------------------- | ---------------------------- | ----------------------- |
+| x84_64 / amd64 | [Download][x84_64-gnu] | - |
+| armv7 (Raspberry Pi) | [Download][armv7-gnu] | - |
+| armv8 / aarch64 | [Download][armv8-gnu] | - |
+| arm | [Download][arm] | - |
+
+[x84_64-gnu]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/conduit-x86_64-unknown-linux-gnu?job=build:cargo:x86_64-unknown-linux-gnu
+[armv7-gnu]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/conduit-armv7-unknown-linux-gnueabihf?job=build:cargo:armv7-unknown-linux-gnueabihf
+[armv8-gnu]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/conduit-aarch64-unknown-linux-gnu?job=build:cargo:aarch64-unknown-linux-gnu
+[arm]: https://conduit.rs/master/arm/conduit-bin
```bash
$ sudo wget -O /usr/local/bin/matrix-conduit <url>