From: 6543 <6543@obermui.de>
Date: Thu, 13 Apr 2023 20:33:00 +0000 (+0200)
Subject: Fix & Optimize CI config (#2802)
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%22https:/hacktivis.me/static/%7Bpost.url%7D?a=commitdiff_plain;h=e7a2080f3f54de645024d0cf5d84bd32a5c5def9;p=lemmy.git

Fix & Optimize CI config (#2802)

* let the clone plugin handle submodules too

* start using yml aliase

* fix publish_to_crates_io

* CI.restart()
---

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 9b96c52d..adeeffd8 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,18 +1,20 @@
 # TODO: The when: platform conditionals aren't working currently
 # See https://github.com/woodpecker-ci/woodpecker/issues/1677
 
+variables:
+  - &muslrust_image 'clux/muslrust:1.67.0'
+
+clone:
+  git:
+    image: woodpeckerci/plugin-git
+    settings:
+      recursive: true
+      submodule_update_remote: true
+
 pipeline:
   # use minimum supported rust version for most steps
-  prepare_repo:
-    image: alpine:3
-    commands:
-      - apk add git
-        #- git fetch --tags
-      - git submodule init
-      - git submodule update --recursive --remote
-
   cargo_fmt:
-    image: clux/muslrust:1.67.0
+    image: *muslrust_image
     environment:
       # store cargo data in repo folder so that it gets cached between steps
       CARGO_HOME: .cargo
@@ -28,7 +30,7 @@ pipeline:
   # check each package to make sure they compile with default features.
   # this is required for crates.io
   cargo_check:
-    image: clux/muslrust:1.67.0
+    image: *muslrust_image
     environment:
       CARGO_HOME: .cargo
     commands:
@@ -50,7 +52,7 @@ pipeline:
     #   platform: linux/amd64
 
   cargo_clippy:
-    image: clux/muslrust:1.67.0
+    image: *muslrust_image
     environment:
       CARGO_HOME: .cargo
     commands:
@@ -74,7 +76,7 @@ pipeline:
     #   platform: linux/amd64
 
   lemmy_api_common_doesnt_depend_on_diesel:
-    image: clux/muslrust:1.67.0
+    image: *muslrust_image
     environment:
       CARGO_HOME: .cargo
     commands:
@@ -83,7 +85,7 @@ pipeline:
     #   platform: linux/amd64
 
   check_defaults_hjson_updated:
-    image: clux/muslrust:1.67.0
+    image: *muslrust_image
     environment:
       CARGO_HOME: .cargo
     commands:
@@ -94,7 +96,7 @@ pipeline:
     #   platform: linux/amd64
 
   cargo_test:
-    image: clux/muslrust:1.67.0
+    image: *muslrust_image
     environment:
       LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
       RUST_BACKTRACE: "1"
@@ -107,7 +109,7 @@ pipeline:
     #   platform: linux/amd64
 
   cargo_build:
-    image: clux/muslrust:1.67.0
+    image: *muslrust_image
     environment:
       CARGO_HOME: .cargo
     commands:
@@ -216,11 +218,11 @@ pipeline:
 
   # using https://github.com/pksunkara/cargo-workspaces
   publish_to_crates_io:
-    image: clux/muslrust:1.67.0
+    image: *muslrust_image
     commands:
       - cargo install cargo-workspaces
       - cp -r migrations crates/db_schema/
-      - cargo login "$CARGO_TOKEN"
+      - cargo login "$CARGO_API_TOKEN"
       - cargo workspaces publish --from-git --allow-dirty --no-verify --allow-branch "${CI_COMMIT_TAG}" --yes custom "${CI_COMMIT_TAG}"
     secrets: [cargo_api_token]
     when: