Merge pull request #297 from jorisv/topic/change-default-branch

Change work in progress branch

Author: jorisv

.github/workflows/check-changelog.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     types: [assigned, opened, synchronize, reopened, labeled, unlabeled]
     branches:
-      - devel
+      - main
 jobs:
   check-changelog:
     name: Check changelog action

.github/workflows/macos-linux-pixi.yml

@@ -4,14 +4,12 @@ on:
   push:
     branches:
       - main
-      - devel
     paths-ignore:
       - 'doc/**'
       - 'scripts/**'
       - '.gitlab-ci.yml'
       - '.gitignore'
-      - '*.md'
-      - 'CHANGELOG.md'
+      - '**.md'
       - 'CITATION.cff'
       - 'CITATIONS.bib'
   pull_request:
@@ -20,8 +18,7 @@ on:
       - 'scripts/'
       - '.gitlab-ci.yml'
       - '.gitignore'
-      - '*.md'
-      - 'CHANGELOG.md'
+      - '**.md'
       - 'CITATION.cff'
       - 'CITATIONS.bib'
 concurrency:

.github/workflows/nix.yml

@@ -4,12 +4,9 @@ on:
   push:
     branches:
       - main
-      - devel
   pull_request:
     branches:
       - main
-      - devel
-
 jobs:
   nix:
     runs-on: "${{matrix.os}}-latest"

.github/workflows/update_pixi_lockfile.yml

@@ -22,7 +22,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ steps.generate-token.outputs.token }}
-          ref: devel
           # Make sure the value of GITHUB_TOKEN will not be persisted in repo's config
           persist-credentials: false
 
@@ -44,7 +43,7 @@ jobs:
           title: Update pixi lockfile
           body-path: diff.md
           branch: topic/update-pixi
-          base: devel
+          base: main
           labels: pixi
           delete-branch: true
           add-paths: pixi.lock

build_scripts/pixi/activation.sh development/pixi/activation.shbuild_scripts/pixi/activation.sh renamed to development/pixi/activation.sh

@@ -0,0 +1,33 @@
+# Release with Pixi
+
+To create a release with Pixi run the following commands on the **main** branch:
+
+```bash
+aligator_VERSION=X.Y.Z pixi run release_new_version
+git push origin
+git push origin vX.Y.Z
+```
+
+Where `X.Y.Z` is the new version.
+Be careful to follow the [Semantic Versioning](https://semver.org/spec/v2.0.0.html) rules.
+
+You will find the following assets:
+- `./build_new_version/aligator-X.Y.Z.tar.gz`
+- `./build_new_version/aligator-X.Y.Z.tar.gz.sig`
+
+Then, create a new release on [GitHub](https://github.com/Simple-Robotics/aligator/releases/new) with:
+
+* Tag: vX.Y.Z
+* Title: aligator vX.Y.Z
+* Body:
+```
+## What's Changed
+
+CHANGELOG CONTENT
+
+**Full Changelog**: https://github.com/Simple-Robotics/aligator/compare/vXX.YY.ZZ...vX.Y.Z
+```
+
+Where `XX.YY.ZZ` is the last release version.
+
+Then upload `aligator-X.Y.Z.tar.gz` and `aligator-X.Y.Z.tar.gz.sig` and publish the release.

build_scripts/pixi/activation_clang.sh development/pixi/activation_clang.shbuild_scripts/pixi/activation_clang.sh renamed to development/pixi/activation_clang.sh

@@ -29,7 +29,7 @@ typed-argument-parser = ">=1.10.0"
 meshcat-python = ">=0.3"
 
 [activation]
-scripts = ["build_scripts/pixi/activation.sh"]
+scripts = ["development/pixi/activation.sh"]
 
 [tasks]
 # We must avoid to set CMAKE_CXX_FLAGS because of WIN32
@@ -104,7 +104,7 @@ python = "3.9.*"
 # to avoid cxx-compiler to overwrite them.
 [feature.clang]
 platforms = ["linux-64"]
-activation = { scripts = ["build_scripts/pixi/activation_clang.sh"] }
+activation = { scripts = ["development/pixi/activation_clang.sh"] }
 dependencies = { clangxx = "*" }
 
 [environments]