From a21d64f5d9801edb25741c8d1ca9703142ffc1dd Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 20 Dec 2023 12:39:24 +0100
Subject: [PATCH] move to orig position

---
 .woodpecker.yml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index e1b4a550d..1ae2df457 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -72,7 +72,8 @@ steps:
     commands:
       - wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz
       - tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz
-      - ./cargo-binstall -y cargo-machete
+      - cp cargo-binstall /usr/local/cargo/bin
+      - cargo binstall -y cargo-machete
       - cargo machete
 
   ignored_files:
@@ -107,19 +108,6 @@ steps:
       [MINIO_ENDPOINT, MINIO_WRITE_USER, MINIO_WRITE_PASSWORD, MINIO_BUCKET]
     when: *slow_check_paths
 
-  # using https://github.com/pksunkara/cargo-workspaces
-  publish_to_crates_io:
-    image: *rust_image
-    commands:
-      - 'echo "pub const VERSION: &str = \"$(git describe --tag)\";" > "crates/utils/src/version.rs"'
-      - cargo install cargo-workspaces
-      - cp -r migrations crates/db_schema/
-      - 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:
-      event: tag
-
   # make sure api builds with default features (used by other crates relying on lemmy api)
   check_api_common_default_features:
     image: *rust_image
@@ -274,6 +262,19 @@ steps:
     when:
       event: cron
 
+  # using https://github.com/pksunkara/cargo-workspaces
+  publish_to_crates_io:
+    image: *rust_image
+    commands:
+      - 'echo "pub const VERSION: &str = \"$(git describe --tag)\";" > "crates/utils/src/version.rs"'
+      - cargo install cargo-workspaces
+      - cp -r migrations crates/db_schema/
+      - 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:
+      event: tag
+
   notify_on_failure:
     image: alpine:3
     commands: