.gitlab-ci.yml

@@ -8,57 +8,34 @@ stages:
   - upload
   - release
 
-.setup_script: &setup_scripts
-  - apt-get -y install rustup libdbus-glib-1-dev
-  - rustup default stable
-  - cargo install cargo-deb
-
 # Stage "build"
-.compile: &compile
-  stage: compile
+build:
+  stage: build
   rules:
     - if: $VERSION
   script:
-    - *setup_scripts
-    - mkdir -p ./build;cargo deb --output ./build
+    - apt-get -y install rustup libdbus-glib-1-dev
+    - rustup default stable
+    - cargo install cargo-deb
+    - mkdir ./build;cargo deb --output ./build
+
+  # The files which are to be made available in GitLab
   artifacts:
     paths:
       - build/*
     untracked: true
 
-build:x86_64:
-  <<: *compile
-  stage: build
-  tags:
-    - x86_64
-
-build:aarch64:
-  <<: *compile
-  stage: build
-  tags:
-    - aarch64
-
 upload:
   stage: upload
   dependencies:
-    - build:x86_64
-    - build:aarch64
+    - build
   rules:
     - if: $VERSION
   script:
-    - find ./build -name "*.deb"
-    - debs=( $( find ./build -name "*.deb" ) )
-    - assets=""
-    - for d in ${debs[@]};do
-    -   file=$( basename ${d} )
-    -   url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/batalert/${VERSION}/${file}"
-    -   assets="${assets} --assets-link {\"name\":\"${file}\",\"url\":\"${url}\",\"link_type\":\"other\"} "
-    -   "curl --header \"JOB-TOKEN: $CI_JOB_TOKEN\" --upload-file \"${d}\" \"${url}\""
-    - done
-    - echo "ASSETS_ARG=${assets}" >> assets.env
-  artifacts:
-    reports:
-      dotenv: assets.env
+    - file=$( find ./build -name "*.deb" | head -n 1 )
+    - export filename=$( basename $file )
+    - package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gtkgreet/${VERSION}/${filename}"
+    - "curl --header \"JOB-TOKEN: $CI_JOB_TOKEN\" --upload-file \"${file}\" \"${package_url}\""
 
 release:
   stage: release
@@ -66,6 +43,12 @@ release:
   rules:
     - if: $VERSION
   script:
-    - echo "making release!"
-    - echo ${ASSETS_ARG}
-    - release-cli create --name "Release ${VERSION}" --tag-name "${VERSION}" ${ASSETS_ARG}
+    - echo "making release! ${package_url}"
+  release:
+    tag_name: "${VERSION}-${CI_RUNNER_EXECUTABLE_ARCH#*/}"
+    description: "batalert ${VERSION} ${CI_RUNNER_EXECUTABLE_ARCH}"
+    assets:
+      links:
+        - name: "${CI_RUNNER_EXECUTABLE_ARCH} deb"
+          url: "$package_url"
+