fix ci/cd workflow

.github/workflows/ci.yml

@@ -46,112 +46,23 @@ jobs:
 
       - name: Run Cargo Audit
         run: cargo audit --ignore RUSTSEC-2023-0071
-<<<<<<< HEAD:.github/workflows/rust.yml
   test:
     name: Run Tests
     runs-on: ubuntu-latest
-=======
-
-  test:
-    name: Test Suite
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-14
-            target: aarch64-apple-darwin
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
-          - os: ubuntu-24.04-arm
-            target: aarch64-unknown-linux-gnu
-
->>>>>>> 38723e90 (feat: add ci/cd pipelines for releases):.github/workflows/ci.yml
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
 
       - name: Install Rust nightly
         uses: dtolnay/rust-toolchain@nightly
         with:
-<<<<<<< HEAD:.github/workflows/rust.yml
           targets: x86_64-unknown-linux-gnu
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "ferrumc-test"
-=======
-          targets: ${{ matrix.target }}
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: ${{ matrix.target }}
-
->>>>>>> 38723e90 (feat: add ci/cd pipelines for releases):.github/workflows/ci.yml
       - name: Install cargo-nextest
         uses: taiki-e/install-action@v2
         with:
           tool: cargo-nextest
-<<<<<<< HEAD:.github/workflows/rust.yml
       - name: Run Tests
         run: cargo nextest run --target x86_64-unknown-linux-gnu --all-targets --all-features -E "not kind(bench)"
-=======
-
-      - name: Run tests
-        run: cargo nextest run --target ${{ matrix.target }} --all-targets --all-features -E "not kind(bench)"
-
-  build:
-    name: Build Binaries
-    runs-on: ${{ matrix.os }}
-    needs: [formatting_and_quality, test]
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-14
-            target: aarch64-apple-darwin
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
-          - os: ubuntu-24.04-arm
-            target: aarch64-unknown-linux-gnu
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Install Rust nightly
-        uses: dtolnay/rust-toolchain@nightly
-        with:
-          targets: ${{ matrix.target }}
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: ${{ matrix.target }}
-
-      - name: Build release binary
-        run: cargo build --release --target ${{ matrix.target }}
-
-      - name: Strip binary (Linux/macOS)
-        if: runner.os != 'Windows'
-        run: strip target/${{ matrix.target }}/release/ferrumc || true
-
-      - name: Prepare artifact
-        run: |
-          mkdir -p artifacts
-          if [ "${{ runner.os }}" = "Windows" ]; then
-            cp target/${{ matrix.target }}/release/ferrumc.exe artifacts/ferrumc-${{ matrix.target }}.exe
-          else
-            cp target/${{ matrix.target }}/release/ferrumc artifacts/ferrumc-${{ matrix.target }}
-          fi
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ferrumc-${{ matrix.target }}
-          path: artifacts/*
-          retention-days: 7
->>>>>>> 38723e90 (feat: add ci/cd pipelines for releases):.github/workflows/ci.yml

.github/workflows/release.yml

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 name: Release
 on:
   push:
@@ -53,71 +52,10 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
-=======
-name: CD - Release
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release version (e.g., v0.1.0)'
-        required: true
-        type: string
-      prerelease:
-        description: 'Mark this release as a pre-release'
-        required: false
-        type: boolean
-        default: false
-
-permissions:
-  contents: write
-  packages: write
-
-env:
-  CARGO_TERM_COLOR: always
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  approval:
-    name: Require Approval
-    runs-on: ubuntu-latest
-    environment: release
-    steps:
-      - name: Approval gate
-        run: echo "Release approved for ${{ inputs.version }}"
-
-  build-binaries:
-    name: Build Release Binaries
-    needs: approval
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-14
-            target: aarch64-apple-darwin
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
-          - os: ubuntu-24.04-arm
-            target: aarch64-unknown-linux-gnu
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
->>>>>>> 38723e90 (feat: add ci/cd pipelines for releases)
       - name: Install Rust nightly
         uses: dtolnay/rust-toolchain@nightly
         with:
           targets: ${{ matrix.target }}
-<<<<<<< HEAD
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "ferrumc"
@@ -172,120 +110,3 @@ jobs:
             ferrumc-*.tar.gz
             ferrumc-*.zip
             ferrumc-*.sha256
-=======
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: ${{ matrix.target }}
-
-      - name: Build release binary
-        run: cargo build --release --target ${{ matrix.target }}
-
-      - name: Strip binary (Linux/macOS)
-        if: runner.os != 'Windows'
-        run: strip target/${{ matrix.target }}/release/ferrumc || true
-
-      - name: Prepare binary
-        run: |
-          mkdir -p release
-          if [ "${{ runner.os }}" = "Windows" ]; then
-            cp target/${{ matrix.target }}/release/ferrumc.exe release/ferrumc-${{ inputs.version }}-${{ matrix.target }}.exe
-          else
-            cp target/${{ matrix.target }}/release/ferrumc release/ferrumc-${{ inputs.version }}-${{ matrix.target }}
-          fi
-
-      - name: Generate checksums
-        run: |
-          cd release
-          if [ "${{ runner.os }}" = "Windows" ]; then
-            certutil -hashfile ferrumc-${{ inputs.version }}-${{ matrix.target }}.exe SHA256 > ferrumc-${{ inputs.version }}-${{ matrix.target }}.exe.sha256
-          else
-            shasum -a 256 ferrumc-${{ inputs.version }}-${{ matrix.target }} > ferrumc-${{ inputs.version }}-${{ matrix.target }}.sha256
-          fi
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-${{ matrix.target }}
-          path: release/*
-
-  build-docker:
-    name: Build and Push Docker Image
-    needs: approval
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=raw,value=${{ inputs.version }}
-            type=raw,value=latest,enable=${{ inputs.prerelease == false }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-  create-release:
-    name: Create GitHub Release
-    needs: [build-binaries, build-docker]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-          pattern: release-*
-          merge-multiple: true
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ inputs.version }}
-          name: Release ${{ inputs.version }}
-          generate_release_notes: true
-          draft: false
-          prerelease: ${{ inputs.prerelease }}
-          files: artifacts/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  trigger-site-deploy:
-    name: Trigger Site Deployment
-    needs: create-release
-    if: ${{ inputs.prerelease == false }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Trigger site repository workflow
-        run: |
-          curl -X POST \
-            -H "Accept: application/vnd.github+json" \
-            -H "Authorization: Bearer ${{ secrets.SITE_DEPLOY_TOKEN }}" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/ferrumc-rs/site/actions/workflows/deploy.yml/dispatches \
-            -d '{"ref":"main","inputs":{"release_version":"${{ inputs.version }}"}}'
->>>>>>> 38723e90 (feat: add ci/cd pipelines for releases)