From 917a60bd6c6ae81589766faf0ca2773a45f48b2f Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 16:18:47 -0400 Subject: [PATCH 1/7] Added tag release workflow --- .gitea/workflows/tag_release.yml | 57 ++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .gitea/workflows/tag_release.yml diff --git a/.gitea/workflows/tag_release.yml b/.gitea/workflows/tag_release.yml new file mode 100644 index 0000000..2650433 --- /dev/null +++ b/.gitea/workflows/tag_release.yml @@ -0,0 +1,57 @@ +name: Release Tagging + +on: + push: + branches: + - main + - devel + tags: + - 'v*' # Trigger on tags matching v* + +jobs: + release: + runs-on: ubuntu-24.04 + steps: + - name: Checkout code + uses: actions/checkout@v3 + with: + fetch-depth: 0 # Important for git describe --tags + + - name: Install Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: 1.85.0 + components: cargo + + - name: Extract Version from Cargo.toml + id: version + run: | + VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/') + PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) + 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 "Version: $VERSION" + echo "Hash: $PROJECT_COMMIT_HASH" + echo "Branch: $BRANCH_NAME" + echo "Tag Release: $PROJECT_TAG_RELEASE" + + - name: Print version + id: Version + run: | + echo "Printing version" + echo "Version: ${{ steps.version.outputs.project_tag_release }}" + + - name: Create GitHub Release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.version.outputs.project_tag_release }} + release_name: Release ${{ steps.version.outputs.project_tag_release }} + body: | + Release of version ${{ steps.version.outputs.project_tag_release }} + # draft: false + # prerelease: ${{ startsWith(github.ref, 'v') == false }} # prerelease if not a valid release tag + From cab03bed65b8527eee7ce58edd58f7b844df2deb Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 20:22:04 +0000 Subject: [PATCH 2/7] Added workflow file (#1) Reviewed-on: https://git.kundeng.us/phoenix/songparser/pulls/1 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/workflow.yml | 75 +++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 .gitea/workflows/workflow.yml diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml new file mode 100644 index 0000000..f010500 --- /dev/null +++ b/.gitea/workflows/workflow.yml @@ -0,0 +1,75 @@ +name: Rust Build + +on: + push: + branches: + - main + - devel + pull_request: + branches: + - main + - devel + +jobs: + check: + name: Check + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v4 + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + toolchain: 1.85.0 + - run: cargo check + + test: + name: Test Suite + runs-on: ubuntu-24.04 + steps: + - 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 + with: + toolchain: 1.85.0 + - run: | + mkdir -p ~/.ssh + echo "$EXTREPO_KEY" > ~/.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 + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/gitlab_deploy_key + + cargo build --release + env: + EXTREPO_KEY: ${{ secrets.MYREPO_TOKEN }} + From 8dbda255abf8de87484f3c9eadc9aa5748559fd6 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 20:53:14 +0000 Subject: [PATCH 3/7] update icarus-models (#3) Reviewed-on: https://git.kundeng.us/phoenix/songparser/pulls/3 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitignore | 1 + Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ea8c4bf..96ef6c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +Cargo.lock diff --git a/Cargo.toml b/Cargo.toml index 0ee9e73..bc588ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,4 +4,4 @@ version = "0.1.0" edition = "2024" [dependencies] -icarus-models = { git = "ssh://git@gitlab.com/kdeng00/icarus-models.git", tag = "v0.1.0" } +icarus-models = { git = "ssh://git@git.kundeng.us/phoenix/icarus-models.git", tag = "v0.1.14" } From cbb286790c6c4f7ffdf93e7694686b16bc9dd315 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 22:35:01 +0000 Subject: [PATCH 4/7] Added stage to add ssh key (#4) Reviewed-on: https://git.kundeng.us/phoenix/songparser/pulls/4 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/workflow.yml | 101 ++++++++++++++++++++++------------ 1 file changed, 65 insertions(+), 36 deletions(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index f010500..a3285aa 100644 --- a/.gitea/workflows/workflow.yml +++ b/.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 "${{ secreats.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: - - 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 + needs: setup_ssh 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 "${{ secreats.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 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 "${{ secreats.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 + 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 "${{ secreats.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 + 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 "${{ secreats.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 + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/gitlab_deploy_key cargo build --release - env: - EXTREPO_KEY: ${{ secrets.MYREPO_TOKEN }} From 9bfc0a10eab56d143ce7c0934d8ba2d7a1a6f13e Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 22:30:03 -0400 Subject: [PATCH 5/7] Updated tag release stamp --- .gitea/workflows/tag_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/tag_release.yml b/.gitea/workflows/tag_release.yml index 2650433..d96250e 100644 --- a/.gitea/workflows/tag_release.yml +++ b/.gitea/workflows/tag_release.yml @@ -31,7 +31,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" From a24dd6aba05a8fe88549ffa7a65d6c5849d36b12 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 30 Mar 2025 02:48:44 +0000 Subject: [PATCH 6/7] Fixing workflow (#6) Reviewed-on: https://git.kundeng.us/phoenix/songparser/pulls/6 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/workflow.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index a3285aa..49dfdc3 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -21,7 +21,7 @@ jobs: toolchain: 1.85.0 - run: | mkdir -p ~/.ssh - echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key + 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) @@ -39,9 +39,9 @@ jobs: toolchain: 1.85.0 - run: | mkdir -p ~/.ssh - echo "${{ secreats.MYREPO_TOKEN }}" > ~/.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 @@ -58,9 +58,9 @@ jobs: - run: rustup component add rustfmt - run: | mkdir -p ~/.ssh - echo "${{ secreats.MYREPO_TOKEN }}" > ~/.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 fmt --all -- --check @@ -77,9 +77,9 @@ jobs: - run: rustup component add clippy - run: | mkdir -p ~/.ssh - echo "${{ secreats.MYREPO_TOKEN }}" > ~/.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 clippy -- -D warnings @@ -95,9 +95,9 @@ jobs: toolchain: 1.85.0 - run: | mkdir -p ~/.ssh - echo "${{ secreats.MYREPO_TOKEN }}" > ~/.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 build --release From 775a62d9cce56007fe068773af91f19e2c2b5a10 Mon Sep 17 00:00:00 2001 From: KD Date: Sun, 30 Mar 2025 13:42:29 -0400 Subject: [PATCH 7/7] Updated icarus_models --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index bc588ea..6e920aa 100644 --- a/Cargo.toml +++ b/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" }