diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..d8846632b --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,38 @@ +# Description + +Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change. + +Fixes # (issue) + +## Type of change + +Please delete options that are not relevant. + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) +- [ ] This change requires a documentation update + +# How Has This Been Tested? + +Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration + +- [ ] Test A +- [ ] Test B + +**Test Configuration**: +* Firmware version: +* Hardware: +* Toolchain: +* SDK: + +# Checklist: + +- [ ] My code follows the style guidelines of this project +- [ ] I have performed a self-review of my code +- [ ] I have commented my code, particularly in hard-to-understand areas +- [ ] I have made corresponding changes to the documentation +- [ ] My changes generate no new warnings +- [ ] I have added tests that prove my fix is effective or that my feature works +- [ ] New and existing unit tests pass locally with my changes +- [ ] Any dependent changes have been merged and published in downstream modules diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ae55154ce..855163cc2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -31,23 +31,38 @@ jobs: - name: Package with Maven run: ./mvnw -B clean package -DskipTests - - name: Check files 1 - run: ls -l src/main/package/ - - - name: Prepare universal package - shell: bash - run: | - mkdir -p target/universal-package && - cp src/main/package/*.bat target/universal-package/ && - cp src/main/package/start* target/universal-package/ && - cp src/main/package/thankyou.* target/universal-package/ && - cp CONTRIBUTING.md target/universal-package/ && - cp LICENSE target/universal-package/ && - cp README.md target/universal-package/ && - cp target/Makelangelo-*-with-dependencies.jar target/universal-package/ && - cd target/universal-package/ && - 7z a -tzip Makelangelo.zip . && - mv Makelangelo.zip ../.. +# - name: Check files 1 +# run: ls -l src/main/package/ + +# - name: Prepare universal package +# shell: bash +# run: | +# mkdir -p target/universal-package && +# cp src/main/package/*.bat target/universal-package/ && +# cp src/main/package/start* target/universal-package/ && +# cp src/main/package/thankyou.* target/universal-package/ && +# cp CONTRIBUTING.md target/universal-package/ && +# cp LICENSE target/universal-package/ && +# cp README.md target/universal-package/ && +# cp target/Makelangelo-*-with-dependencies.jar target/universal-package/ && +# cd target/universal-package/ && +# 7z a -tzip Makelangelo.zip . && +# mv Makelangelo.zip ../.. + +# - name: Check files 2a +# run: ls -l target/universal-package/ + +# - name: Deploy universal release +# if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main') +# uses: WebFreak001/deploy-nightly@v3.2.0 +# with: +# token: ${{ secrets.GITHUB_TOKEN }} # automatically provided by github actions +# upload_url: ${{ env.UPLOAD_URL }} +# release_id: ${{ env.RELEASE_ID }} +# asset_path: Makelangelo.zip # path to archive to upload +# asset_name: Makelangelo-nightly-$$.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash +# asset_content_type: application/zip # required by GitHub API +# max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted - name: Prepare target/package for upload shell: bash @@ -60,23 +75,8 @@ jobs: cp LICENSE target/package/ && cp README.md target/package/ - - name: Check files 2a - run: ls -l target/universal-package/ - - - name: Check files 2b - run: ls -l target/package/ - - - name: Deploy universal release - if: github.repository == 'MarginallyClever/Makelangelo-software' && github.ref == 'refs/heads/master' - uses: WebFreak001/deploy-nightly@v3.2.0 - with: - token: ${{ secrets.GITHUB_TOKEN }} # automatically provided by github actions - upload_url: ${{ env.UPLOAD_URL }} - release_id: ${{ env.RELEASE_ID }} - asset_path: Makelangelo.zip # path to archive to upload - asset_name: Makelangelo-nightly-$$.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash - asset_content_type: application/zip # required by GitHub API - max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted + # - name: Check files 2b + # run: ls -l target/package/ - name: Upload artifact for package uses: actions/upload-artifact@v4.6.0 @@ -90,8 +90,8 @@ jobs: README target/package/* - - name: Check files 3 - run: ls -l target/universal-package/ +# - name: Check files 3 +# run: ls -l target/universal-package/ package: needs: build @@ -109,8 +109,8 @@ jobs: with: name: jar - - name: Check files 4 - run: ls -l target/package/ +# - name: Check files 4 +# run: ls -l target/package/ - name: Build installation package shell: bash diff --git a/pom.xml b/pom.xml index 0cc2d423f..f340d992a 100644 --- a/pom.xml +++ b/pom.xml @@ -537,7 +537,7 @@ It pairs really well with Marlin-polargraph, the code in the brain of the robot compile - + io.github.andrewauclair modern-docking-api @@ -570,7 +570,7 @@ It pairs really well with Marlin-polargraph, the code in the brain of the robot --> com.github.marginallyclever nodegraphcore - 1.3.3 + 1.3.4