Fixes

redlib-org · Mar 3, 2024 · ad7d81a · ad7d81a
1 parent 8ee666e
commit ad7d81a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/build-artifacts.yaml b/.github/workflows/build-artifacts.yaml
@@ -48,15 +48,9 @@ jobs:
           sudo apt update
           sudo apt install -y gcc-aarch64-linux-gnu musl-tools
 
-      # Using DATE-TIME for release name
-      - name: Date
-        id: date
-        run: echo "DATE=$(date +%Y%m%d-%H%M)" >> "$GITHUB_OUTPUT"
-
-      # In case app version is prefered
-      # - name: Versions
-      #   id: version
-      #   run: echo "VERSION=$(cargo metadata --format-version 1 --no-deps | jq .packages[0].version -r | sed 's/^/v/')" >> "$GITHUB_OUTPUT"
+      - name: Versions
+        id: version
+        run: echo "VERSION=$(cargo metadata --format-version 1 --no-deps | jq .packages[0].version -r | sed 's/^/v/')" >> "$GITHUB_OUTPUT"
 
       - name: Build
         run: cargo build --release --target ${{ matrix.target }}
@@ -66,9 +60,16 @@ jobs:
 
       - name: Upload release
         uses: softprops/action-gh-release@v1
+        if: github.base_ref != 'main' && github.event_name == 'release'
         with:
-          tag_name: ${{ steps.date.outputs.DATE }}
+          tag_name: ${{ steps.version.outputs.VERSION }}
+          name: ${{ steps.version.outputs.VERSION }} - ${{ github.event.head_commit.message }}
+          draft: true
           files: |
             redlib-${{ matrix.target }}.tar.gz
+          body: |
+            - ${{ github.event.head_commit.message }} ${{ github.sha }}
+          generate_release_notes: true
+
 
 
diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml
@@ -38,7 +38,7 @@ jobs:
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       -
-        name: Login to GitHub Container Registry
+        name: Login to Quay.io Container Registry
         uses: docker/login-action@v3
         with:
           registry: quay.io
@@ -93,10 +93,10 @@ jobs:
             type=sha
             type=raw,value=latest,enable={{is_default_branch}}
       -
-        name: Login to GitHub Container Registry
+        name: Login to Quay.io Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
+          registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
       -
@@ -106,7 +106,7 @@ jobs:
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
 
-      - name: Oush README to Quay.io
+      - name: Push README to Quay.io
         uses: christian-korneck/update-container-description-action@v1
         env:
           DOCKER_APIKEY: ${{ secrets.APIKEY__QUAY_IO }}