diff --git a/.github/workflows/ci.yml b/.github/workflows/build.yml similarity index 100% rename from .github/workflows/ci.yml rename to .github/workflows/build.yml diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index 5d78947..35d42da 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -19,10 +19,10 @@ jobs: - name: Bump Version and Push tag uses: anothrNick/github-tag-action@1.67.0 env: - DEFAULT_BUMP: "patch" + DEFAULT_BUMP: "none" GITHUB_TOKEN: ${{ secrets.PAT }} WITH_V: true MAJOR_STRING_TOKEN: "major:" MINOR_STRING_TOKEN: "minor:" - PATCH_STRING_TOKEN: "patch:" + PATCH_STRING_TOKEN: "fix:" BRANCH_HISTORY: "compare" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f9a35b..8218201 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v4 - name: Initialize Submodules - run: source ${{ env.SCRIPTS_DIR }}/init_submodules.sh + run: git submodule init && git submodule update - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 @@ -34,17 +34,32 @@ jobs: with: cmakeVersion: "~3.26.0" - - name: Build + - name: Build Unix + if: ${{ matrix.os != 'windows-latest'}} run: source ${{ env.SCRIPTS_DIR }}/build_without_tests.sh - - name: Upload .so files + - name: Build Windows + if: ${{ matrix.os == 'windows-latest' }} + run: .\${{ env.SCRIPTS_DIR }}\build_without_tests.bat + + - name: Upload .so files Unix + if: ${{ matrix.os != 'windows-latest'}} uses: actions/upload-artifact@v4 with: - name: so-file-${{ matrix.os }}-${{ matrix.python-version }} + name: dist-file-${{ matrix.os }}-${{ matrix.python-version }} path: ${{ env.BUILD_DIR}}/*.so if-no-files-found: error retention-days: 1 + - name: Upload Windows DDL files Windows + if: ${{ matrix.os == 'windows-latest' }} + uses: actions/upload-artifact@v4 + with: + name: dist-file-${{ matrix.os }}-${{ matrix.python-version }} + path: ${{ env.BUILD_DIR}}\*.pyd + if-no-files-found: error + retention-days: 1 + release: needs: build runs-on: ubuntu-latest @@ -52,10 +67,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Download .so files + - name: Download distribution files uses: actions/download-artifact@v4 with: - pattern: so-file-* + pattern: dist-file-* path: ${{ env.BUILD_DIR }} merge-multiple: true diff --git a/contribution/README.md b/contribution/README.md index 3f5ce3f..a52965e 100644 --- a/contribution/README.md +++ b/contribution/README.md @@ -8,6 +8,12 @@ The branch name should be a one or two word max (separated with a -) name of the For the main part following whatever's written [here](https://www.conventionalcommits.org/en/v1.0.0/) should be enough. +To bump versions, commits messages should start with : + +- **Major** (eg: v1.0.0 -> v2.0.0): `major:` +- **Minor** (eg: v1.0.0 -> v1.1.0): `minor:` +- **Patch** (eg: v1.0.0 -> v1.0.1): `fix:` + ### Non Functional Commit : Non functional commits are when a feature is still under development but you had to create a commit. For example, if you're working on feature A at home on your PC, and all of a sudden you have to save you're changes so you can resume working at a Starbucks on your laptop. You create a commit with the tag : nfc(A) - A should be replaced with the name of the feature (which is the name of the branch). diff --git a/scripts/build_without_tests.bat b/scripts/build_without_tests.bat new file mode 100644 index 0000000..0e5f32d --- /dev/null +++ b/scripts/build_without_tests.bat @@ -0,0 +1,7 @@ +@echo off + +mkdir build +cd build +cmake -DUNIT_TESTS=OFF .. +make all +cd .. \ No newline at end of file diff --git a/scripts/init_submodules.sh b/scripts/init_submodules.sh deleted file mode 100644 index a50fb6c..0000000 --- a/scripts/init_submodules.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# Initialize the submodules for the first time -git submodule init && git submodule update \ No newline at end of file