Merge pull request #123 from B-urb/development

Development

.github/workflows/push.yml

@@ -32,16 +32,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
           target: ${{ matrix.target }}
-          profile: minimal
-          override: true
       - name: Build
         run: cargo build --release --target ${{ matrix.target }}
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: doclytics-${{ env.BRANCH_NAME }}-${{ matrix.os }}
           path: |
@@ -65,13 +63,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/doclytics:${{ env.BRANCH_NAME }}
-          platforms: linux/amd64,linux/arm64
       - name: 'Login to GitHub Container Registry'
         uses: docker/login-action@v3
         with:
@@ -83,7 +74,10 @@ jobs:
         with:
           context: .
           push: true
-          tags: ghcr.io/b-urb/doclytics:${{ env.BRANCH_NAME }}
+          tags: |
+            ghcr.io/b-urb/doclytics:${{ env.BRANCH_NAME }}
+            bjoern5urban/doclytics:${{ env.BRANCH_NAME }}
+
           platforms: linux/amd64,linux/arm64
   release:
     runs-on: ubuntu-latest

.github/workflows/release-prod.yml

@@ -3,8 +3,10 @@ on:
   push:
     branches:
       - 'v[0-9]+.[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+'
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+'
 env:
   CI: true
 
@@ -24,16 +26,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
           target: ${{ matrix.target }}
-          profile: minimal
-          override: true
+      - name: Install cargo-edit
+        run: |
+          cargo install cargo-edit
+      - name: Update Cargo Version
+        env:
+          VERSION: ${{ github.head_ref || github.ref_name }}
+        run: cargo set-version ${{ env.VERSION }}
       - name: Build
         run: cargo build --release --target ${{ matrix.target }}
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: doclytics-${{ env.BRANCH_NAME }}-${{ matrix.os }}
           path: |
@@ -86,13 +93,17 @@ jobs:
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}
       - name: Build and push
+        env:
+          VERSION: ${{ github.head_ref || github.ref_name }}
         uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/doclytics:${{ env.BRANCH_NAME }}
           platforms: linux/amd64,linux/arm64
       - name: Build and push to GitHub Container Registry
+        env:
+          VERSION: ${{ github.head_ref || github.ref_name }}
         uses: docker/build-push-action@v6
         with:
           context: .

.github/workflows/release.yml

@@ -3,8 +3,10 @@ on:
   push:
     branches:
       - 'v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
 env:
   CI: true
 
@@ -24,16 +26,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
           target: ${{ matrix.target }}
-          profile: minimal
-          override: true
+      - name: Install cargo-edit
+        run: |
+          cargo install cargo-edit
+      - name: Update Cargo Version
+        env:
+          VERSION: ${{ github.head_ref || github.ref_name }}
+        run: cargo set-version ${{ env.VERSION }}
       - name: Build
         run: cargo build --release --target ${{ matrix.target }}
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG_NAME: ${{ github.ref }} # Assumes the tag name is the same as the ref. Adjust if necessary.
@@ -64,6 +71,8 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         uses: docker/build-push-action@v6
+        env:
+          VERSION: ${{ github.head_ref || github.ref_name }}
         with:
           context: .
           push: true
@@ -76,9 +85,11 @@ jobs:
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}
       - name: Build and push to GitHub Container Registry
+        env:
+          VERSION: ${{ github.head_ref || github.ref_name }}
         uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          tags: ghcr.io/b-urb/doclytics:${{ env.BRANCH_NAME }}
+          tags: ghcr.io/b-urb/doclytics:v${{ env.BRANCH_NAME }}
           platforms: linux/amd64,linux/arm64

.releaserc.yml

@@ -18,3 +18,4 @@ branches:
   - name: "development"
     prerelease: "rc"
     channel: "false"
+tagFormat: "${version}"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "doclytics"
-version = "1.1.4-rc.9"
+version = "0.0.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Dockerfile

@@ -1,8 +1,12 @@
-FROM rust:1.81
+FROM rust:1.82
 
 WORKDIR /usr/doclytics
 COPY . .
+ARG VERSION
+RUN cargo install cargo-edit
+RUN cargo set-version ${VERSION}
 
 RUN cargo install --path .
 
+
 CMD ["doclytics"]