Workflow changes (#9)

Reviewed-on: #9
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>

.gitea/workflows/tag_release.yml

@@ -3,7 +3,6 @@ name: Release Tagging
 on:
   push:
     branches:
-      - main
       - devel
     tags:
       - 'v*' # Trigger on tags matching v*
@@ -20,7 +19,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.86.0
           components: cargo
 
       - name: Extract Version from Cargo.toml
@@ -31,7 +30,7 @@ jobs:
           BRANCH_REF="${GITHUB_REF}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
           PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
-          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-111"
+          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-372"
           echo "Version: $VERSION"
           echo "Hash: $PROJECT_COMMIT_HASH"
           echo "Branch: $BRANCH_NAME"
@@ -43,6 +42,12 @@ jobs:
           echo "Printing version"
           echo "Version: ${{ steps.version.outputs.project_tag_release }}"
 
+      - name: Check Branch
+        if: github.ref != 'refs/heads/devel' || github.ref != 'refs/heads/devel' # Replace 'main' with your required branch
+        run: |
+          echo "::error::Release can only be created from the 'main' branch."
+          exit 1
+
       - name: Create GitHub Release
         uses: actions/create-release@v1
         env:

.gitea/workflows/workflow.yml

@@ -19,43 +19,19 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.85.0
-      - run: cargo check
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
+          chmod 600 ~/.ssh/gitlab_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/gitlab_deploy_key
+          cargo check
 
   test:
     name: Test Suite
     runs-on: ubuntu-24.04
-    steps:
+    needs: setup_ssh
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.85.0
-      - run: cargo test
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.85.0
-      - run: rustup component add rustfmt
-      - run: cargo fmt --all -- --check
-
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.85.0
-      - run: rustup component add clippy
-      - run: cargo clippy -- -D warnings
-
-  build:
-    name: build
-    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -63,13 +39,66 @@ jobs:
           toolchain: 1.85.0
       - run: |
           mkdir -p ~/.ssh
-          echo "$EXTREPO_KEY" > ~/.ssh/gitlab_deploy_key
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
           chmod 600 ~/.ssh/gitlab_deploy_key
-          ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/gitlab_deploy_key
+          cargo test
 
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-24.04
+    needs: setup_ssh
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.85.0
+      - run: rustup component add rustfmt
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
+          chmod 600 ~/.ssh/gitlab_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/gitlab_deploy_key
+          cargo fmt --all -- --check
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-24.04
+    needs: setup_ssh
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.85.0
+      - run: rustup component add clippy
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
+          chmod 600 ~/.ssh/gitlab_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/gitlab_deploy_key
+          cargo clippy -- -D warnings
+
+  build:
+    name: build
+    runs-on: ubuntu-24.04
+    needs: setup_ssh
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.85.0
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
+          chmod 600 ~/.ssh/gitlab_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/gitlab_deploy_key
           cargo build --release
-        env:
-          EXTREPO_KEY: ${{ secrets.MYREPO_TOKEN }}
 

Cargo.toml

@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-icarus-models = { git = "ssh://git@git.kundeng.us/phoenix/icarus-models.git", tag = "v0.1.14" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.2.0" }