Merge branch 'ci-improv' into 'main'

CI: Better download file names Closes #38 See merge request !34

Merge branch 'ci-improv' into 'main'
CI: Better download file names Closes #38 See merge request !34
7b28b0f8 · Ayush Singh · 0af68c65 · 9ff48794 · 7b28b0f8 · 7b28b0f8
Commit 7b28b0f8 authored 3 months ago by Ayush Singh
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -161,121 +161,121 @@ deploy:
    assets:
      links:
        - name: 'x86_64-bb-imager-cli-windows.zip'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-pc-windows-gnu.zip'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-pc-windows-gnu/bb-imager-cli.zip'
          link_type: 'package'
        - name: 'x86_64-bb-imager-cli-windows.zip.sha256'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-pc-windows-gnu.zip.sha256'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-pc-windows-gnu/bb-imager-cli.zip.sha256'

        - name: 'x86_64-bb-imager-gui-windows.zip'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-pc-windows-gnu.zip'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-pc-windows-gnu/bb-imager-gui.zip'
          link_type: 'package'
        - name: 'x86_64-bb-imager-gui-windows.zip.sha256'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-pc-windows-gnu.zip.sha256'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-pc-windows-gnu/bb-imager-gui.zip.sha256'

        - name: 'x86_64-bb-imager-cli-linux.xz'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-unknown-linux-gnu.xz'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-unknown-linux-gnu/bb-imager-cli.xz'
          link_type: 'package'
        - name: 'x86_64-bb-imager-cli-linux.xz.sha256'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-unknown-linux-gnu.xz.sha256'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-unknown-linux-gnu/bb-imager-cli.xz.sha256'

        - name: 'x86_64-bb-imager-cli-linux.deb'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-unknown-linux-gnu.deb'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-unknown-linux-gnu/bb-imager-cli.deb'
          link_type: 'package'
        - name: 'x86_64-bb-imager-cli-linux.deb.sha256'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-unknown-linux-gnu.deb.sha256'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-unknown-linux-gnu/bb-imager-cli.deb.sha256'

        - name: 'x86_64-bb-imager-gui-linux.AppImage'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-unknown-linux-gnu.AppImage'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-unknown-linux-gnu/bb-imager-gui.AppImage'
          link_type: 'package'
        - name: 'x86_64-bb-imager-gui-linux.AppImage.sha256'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-unknown-linux-gnu.AppImage.sha256'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-unknown-linux-gnu/bb-imager-gui.AppImage.sha256'

        - name: 'x86_64-bb-imager-gui-linux.deb'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-unknown-linux-gnu.deb'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-unknown-linux-gnu/bb-imager-gui.deb'
          link_type: 'package'
        - name: 'x86_64-bb-imager-gui-linux.deb.sha256'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-unknown-linux-gnu.deb.sha256'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-unknown-linux-gnu/bb-imager-gui.deb.sha256'

        - name: 'aarch64-bb-imager-cli-linux.xz'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-unknown-linux-gnu.xz'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-unknown-linux-gnu/bb-imager-cli.xz'
          link_type: 'package'
        - name: 'aarch64-bb-imager-cli-linux.xz.sha256'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-unknown-linux-gnu.xz.sha256'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-unknown-linux-gnu/bb-imager-cli.xz.sha256'

        - name: 'aarch64-bb-imager-cli-linux.deb'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-unknown-linux-gnu.deb'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-unknown-linux-gnu/bb-imager-cli.deb'
          link_type: 'package'
        - name: 'aarch64-bb-imager-cli-linux.deb.sha256'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-unknown-linux-gnu.deb.sha256'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-unknown-linux-gnu/bb-imager-cli.deb.sha256'

        - name: 'aarch64-bb-imager-gui-linux.AppImage'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-unknown-linux-gnu.AppImage'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-unknown-linux-gnu/bb-imager-gui.AppImage'
          link_type: 'package'
        - name: 'aarch64-bb-imager-gui-linux.AppImage.sha256'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-unknown-linux-gnu.AppImage.sha256'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-unknown-linux-gnu/bb-imager-gui.AppImage.sha256'

        - name: 'aarch64-bb-imager-gui-linux.deb'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-unknown-linux-gnu.deb'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-unknown-linux-gnu/bb-imager-gui.deb'
          link_type: 'package'
        - name: 'aarch64-bb-imager-gui-linux.deb.sha256'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-unknown-linux-gnu.deb.sha256'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-unknown-linux-gnu/bb-imager-gui.deb.sha256'

        - name: 'arm-bb-imager-cli-linux.xz'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/armv7-unknown-linux-gnueabihf.xz'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/armv7-unknown-linux-gnueabihf/bb-imager-cli.xz'
          link_type: 'package'
        - name: 'arm-bb-imager-cli-linux.xz.sha256'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/armv7-unknown-linux-gnueabihf.xz.sha256'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/armv7-unknown-linux-gnueabihf/bb-imager-cli.xz.sha256'

        - name: 'arm-bb-imager-cli-linux.deb'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/armv7-unknown-linux-gnueabihf.deb'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/armv7-unknown-linux-gnueabihf/bb-imager-cli.deb'
          link_type: 'package'
        - name: 'arm-bb-imager-cli-linux.deb.sha256'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/armv7-unknown-linux-gnueabihf.deb.sha256'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/armv7-unknown-linux-gnueabihf/bb-imager-cli.deb.sha256'

        - name: 'arm-bb-imager-gui-linux.AppImage'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/armv7-unknown-linux-gnueabihf.AppImage'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/armv7-unknown-linux-gnueabihf/bb-imager-gui.AppImage'
          link_type: 'package'
        - name: 'arm-bb-imager-gui-linux.AppImage.sha256'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/armv7-unknown-linux-gnueabihf.AppImage.sha256'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/armv7-unknown-linux-gnueabihf/bb-imager-gui.AppImage.sha256'

        - name: 'arm-bb-imager-gui-linux.deb'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/armv7-unknown-linux-gnueabihf.deb'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/armv7-unknown-linux-gnueabihf/bb-imager-gui.deb'
          link_type: 'package'
        - name: 'arm-bb-imager-gui-linux.deb.sha256'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/armv7-unknown-linux-gnueabihf.deb.sha256'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/armv7-unknown-linux-gnueabihf/bb-imager-gui.deb.sha256'

        - name: 'aarch64-bb-imager-cli-darwin.zip'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-apple-darwin.zip'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-apple-darwin/bb-imager-cli.zip'
          link_type: 'package'
        - name: 'aarch64-bb-imager-cli-darwin.zip.sha256'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-apple-darwin.zip.sha256'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/aarch64-apple-darwin/bb-imager-cli.zip.sha256'

        - name: 'aarch64-bb-imager-gui-darwin.dmg'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-apple-darwin.dmg'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-apple-darwin/bb-imager-gui.dmg'
          link_type: 'package'
        - name: 'aarch64-bb-imager-gui-darwin.dmg.sha256'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-apple-darwin.dmg.sha256'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/aarch64-apple-darwin/bb-imager-gui.dmg.sha256'

        - name: 'x86_64-bb-imager-cli-darwin.zip'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-apple-darwin.zip'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-apple-darwin/bb-imager-cli.zip'
          link_type: 'package'
        - name: 'x86_64-bb-imager-cli-darwin.zip.sha256'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-apple-darwin.zip.sha256'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/x86_64-apple-darwin/bb-imager-cli.zip.sha256'

        - name: 'x86_64-bb-imager-gui-darwin.dmg'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-apple-darwin.dmg'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-apple-darwin/bb-imager-gui.dmg'
          link_type: 'package'
        - name: 'x86_64-bb-imager-gui-darwin.dmg.sha256'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-apple-darwin.dmg.sha256'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/x86_64-apple-darwin/bb-imager-gui.dmg.sha256'

        - name: 'universal-bb-imager-cli-darwin.zip'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/universal-apple-darwin.zip'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/universal-apple-darwin/bb-imager-cli.zip'
          link_type: 'package'
        - name: 'universal-bb-imager-cli-darwin.zip.sha256'
-          url: '${PACKAGE_REGISTRY_CLI_URL}/universal-apple-darwin.zip.sha256'
+          url: '${PACKAGE_REGISTRY_CLI_URL}/universal-apple-darwin/bb-imager-cli.zip.sha256'

        - name: 'universal-bb-imager-gui-darwin.dmg'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/universal-apple-darwin.dmg'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/universal-apple-darwin/bb-imager-gui.dmg'
          link_type: 'package'
        - name: 'universal-bb-imager-gui-darwin.dmg.sha256'
-          url: '${PACKAGE_REGISTRY_GUI_URL}/universal-apple-darwin.dmg.sha256'
+          url: '${PACKAGE_REGISTRY_GUI_URL}/universal-apple-darwin/bb-imager-gui.dmg.sha256'
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -507,8 +507,6 @@ dependencies = [
 "clap",
 "indicatif",
 "tokio",
- "tracing",
- "tracing-subscriber",
 ]

 [[package]]

--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -10,7 +10,5 @@ license.workspace = true
 [dependencies]
 clap = { version = "4.5.20", features = ["derive"] }
 bb-imager = { path = "../bb-imager", version = "0.0.3" }
-tracing = "0.1.40"
-tracing-subscriber = "0.3.18"
 tokio = { version = "1.41.0", features = ["macros", "rt-multi-thread"] }
 indicatif = "0.17.8"
--- a/scripts/release.mk
+++ b/scripts/release.mk
@@ -13,20 +13,20 @@ endef

 upload-artifact-linux-%:
 	$(info "Upload Linux $* artifacts")
-	$(call upload_artifact,"${RELEASE_DIR_LINUX}/$*/BeagleBoardImager.AppImage","${PACKAGE_REGISTRY_GUI_URL}/$*.AppImage")
-	$(call upload_artifact,"${RELEASE_DIR_LINUX}/$*/bb-imager-cli.xz","${PACKAGE_REGISTRY_CLI_URL}/$*.xz")
-	$(call upload_artifact,"${RELEASE_DIR_LINUX}/$*/bb-imager-gui.deb","${PACKAGE_REGISTRY_GUI_URL}/$*.deb")
-	$(call upload_artifact,"${RELEASE_DIR_LINUX}/$*/bb-imager-cli.deb","${PACKAGE_REGISTRY_CLI_URL}/$*.deb")
+	$(call upload_artifact,"${RELEASE_DIR_LINUX}/$*/BeagleBoardImager.AppImage","${PACKAGE_REGISTRY_GUI_URL}/$*/bb-imager-gui.AppImage")
+	$(call upload_artifact,"${RELEASE_DIR_LINUX}/$*/bb-imager-gui.deb","${PACKAGE_REGISTRY_GUI_URL}/$*/bb-imager-gui.deb")
+	$(call upload_artifact,"${RELEASE_DIR_LINUX}/$*/bb-imager-cli.xz","${PACKAGE_REGISTRY_CLI_URL}/$*/bb-imager-cli.xz")
+	$(call upload_artifact,"${RELEASE_DIR_LINUX}/$*/bb-imager-cli.deb","${PACKAGE_REGISTRY_CLI_URL}/$*/bb-imager-cli.deb")

 upload-artifact-darwin-%:
 	$(info "Upload Darwin $* artifacts")
-	$(call upload_artifact,"${RELEASE_DIR_DARWIN}/$*/BeagleBoardImager.dmg","${PACKAGE_REGISTRY_GUI_URL}/$*.dmg")
-	$(call upload_artifact,"${RELEASE_DIR_DARWIN}/$*/bb-imager-cli.zip","${PACKAGE_REGISTRY_CLI_URL}/$*.zip")
+	$(call upload_artifact,"${RELEASE_DIR_DARWIN}/$*/BeagleBoardImager.dmg","${PACKAGE_REGISTRY_GUI_URL}/$*/bb-imager-gui.dmg")
+	$(call upload_artifact,"${RELEASE_DIR_DARWIN}/$*/bb-imager-cli.zip","${PACKAGE_REGISTRY_CLI_URL}/$*/bb-imager-cli.zip")

 upload-artifact-windows-%:
 	$(info "Upload Windows $* artifacts")
-	$(call upload_artifact,"${RELEASE_DIR_WINDOWS}/$*/bb-imager-gui.zip","${PACKAGE_REGISTRY_GUI_URL}/$*.zip")
-	$(call upload_artifact,"${RELEASE_DIR_WINDOWS}/$*/bb-imager-cli.zip","${PACKAGE_REGISTRY_CLI_URL}/$*.zip")
+	$(call upload_artifact,"${RELEASE_DIR_WINDOWS}/$*/bb-imager-gui.zip","${PACKAGE_REGISTRY_GUI_URL}/$*/bb-imager-gui.zip")
+	$(call upload_artifact,"${RELEASE_DIR_WINDOWS}/$*/bb-imager-cli.zip","${PACKAGE_REGISTRY_CLI_URL}/$*/bb-imager-cli.zip")

 upload-artifact-linux: upload-artifact-linux-x86_64-unknown-linux-gnu upload-artifact-linux-aarch64-unknown-linux-gnu upload-artifact-linux-armv7-unknown-linux-gnueabihf;