Skip to content

Commit

Permalink
merged master into robotx_qual_task
Browse files Browse the repository at this point in the history
  • Loading branch information
DaniParr committed Sep 6, 2024
2 parents 77f5d1f + b8fe294 commit 20c1958
Show file tree
Hide file tree
Showing 1,226 changed files with 27,259 additions and 11,111 deletions.
14 changes: 0 additions & 14 deletions .alexrc.yaml

This file was deleted.

69 changes: 0 additions & 69 deletions .github/ISSUE_TEMPLATE/navigator.yaml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/software.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
name: Software Issue
description: Add a new software-related issue
labels: ["software"]
body:
- type: markdown
attributes:
value: |
Hey, thanks for taking the time to add this software issue!
- type: textarea
id: description
attributes:
label: What needs to change?
description: >
**Briefly**, tell us what needs to change. This should explain _what_
the task is about. This could include what has broken, what could be better,
or what needs to be researched.
validations:
required: true
- type: textarea
id: testing
attributes:
label: How would this task be tested?
description: >
How does a new member go about testing this task? For example, what
launch files need to be executed, what scripts need to be ran, what needs
to be typed, etc.?
value: |
1.
validations:
required: true
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@


## Related Issues
<!-- BELOW: What issues are closed by this PR? Write "Closed #XXX" to close the issue when the PR is merged. -->
<!-- BELOW: What issues are closed by this PR? Write "Closes #XXX" to link the issue to the PR and close it when the PR is merged. -->

* #XXX
\- Closes #XXX

## Testing
<!-- BELOW: Briefly explain how someone can go about testing your PR. -->
Expand Down
99 changes: 99 additions & 0 deletions .github/workflows/autopush.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
---
name: Autopush

# yamllint disable-line rule:truthy
on:
push:
branches:
- autopush-*

# Cancels this run if a new one referring to the same object and same workflow
# is requested
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
# The version of caching we are using. This can be upgraded if we
# significantly change CI to the point where old caches become irrelevant.
CACHE_VERSION: 0
# Default Python version. Noetic defaults to 3.8.
DEFAULT_PYTHON: 3.8
# Location of the pre-commit cache. This is set by pre-commit, not us!
PRE_COMMIT_CACHE: ~/.cache/pre-commit

jobs:
pre-commit:
name: Run pre-commit
runs-on: ubuntu-latest
if: github.event.sender.login == 'cbrxyz'
steps:
- name: Check out code from GitHub
uses: actions/checkout@v3.0.2
with:
submodules: recursive
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/setup-python@v4.1.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
cache: "pip"
- name: Install pre-commit hooks
run: |
python --version
pip install "$(cat requirements.txt | grep pre-commit)"
- name: Generate pre-commit cache key
id: pre-commit_cache_key
run: >
echo "::set-output
name=key::${{ env.CACHE_VERSION }}-${{ env.DEFAULT_PYTHON }}-${{
hashFiles('.pre-commit-config.yaml') }}"
- name: Restore base pre-commit environment
id: cache-pre-commmit
uses: actions/cache@v3.0.4
with:
path: ${{ env.PRE_COMMIT_CACHE }}
key: >
${{ runner.os
}}-pre-commit-${{ steps.pre-commit_cache_key.outputs.key }}
- name: Install pre-commit dependencies if no cache
if: steps.cache-precommit.outputs.cache-hit != 'true'
run: |
pre-commit install-hooks
- name: Run pre-commit
run: |
pre-commit run --all-files --show-diff-on-failure
autopush:
name: Autopush changes
needs: [pre-commit]
runs-on: ubuntu-latest
steps:
- name: Wait for tests to succeed
uses: lewagon/wait-on-check-action@v1.3.4
with:
ref: ${{ github.ref }}
check-name: 'Run tests and build docs'
repo-token: ${{ secrets.INVESTIGATOR_BOT_TOKEN }}
wait-interval: 10

- name: Check out code from GitHub
uses: actions/checkout@v3.0.2
with:
submodules: recursive
token: ${{ secrets.INVESTIGATOR_BOT_TOKEN }}
ref: ${{ github.event.ref }}
fetch-depth: 0

- name: Create commit
run: |
git fetch
git config --global user.name \
"$(git --no-pager log --format=format:'%an' -n 1)"
git config --global user.email \
"$(git --no-pager log --format=format:'%ae' -n 1)"
git rebase origin/master
git checkout master
git branch
git merge --ff-only ${{ github.event.ref }}
git push
git push -d origin ${{ github.event.ref }}
77 changes: 35 additions & 42 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,49 +31,43 @@ jobs:
- name: Configure catkin workspace folder structure
run: |
mkdir -p $GITHUB_WORKSPACE/catkin_ws/src
sudo apt reinstall python3-pip
- name: Check out code from GitHub
uses: actions/checkout@v3.0.2
uses: actions/checkout@v4
with:
submodules: recursive
path: catkin_ws/src/mil
- name: Setup ROS Noetic
uses: ros-tooling/setup-ros@v0.3
uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: noetic
- name: Install pip dependencies
run: |
cd $GITHUB_WORKSPACE/catkin_ws/src/mil
pip install -r requirements.txt
- name: Install system dependencies
# GH-803: This should not need continue-on-error: true
continue-on-error: true
run: |
cd $GITHUB_WORKSPACE/catkin_ws/src/mil
./scripts/install.sh
pip3 install -r requirements.txt
# We want to run a full test suite in CI - this includes the BlueView
# tests!
- name: Install BlueView Sonar SDK
run: |
cd $GITHUB_WORKSPACE/catkin_ws/src/mil
./scripts/hardware_installers/install_bvtsdk --pass ${{ secrets.ZOBELISK_PASSWORD }}
ls mil_common/drivers/mil_blueview_driver
echo $PWD
- name: Run catkin_make
run: |
export HOME=$GITHUB_WORKSPACE # Temporary fix for setup scripts
cd $GITHUB_WORKSPACE/catkin_ws
ls src/mil/mil_common/drivers/mil_blueview_driver
source /opt/ros/noetic/setup.bash
rm -rf build devel
catkin_make -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-DPYTHON_INCLUDE_DIR=/usr/include/python3.8 \
-j6
# We want to run a full test suite in CI - this includes the BlueView
# tests!
- name: Run pylint
- name: Install system dependencies
run: |
# Needed for /etc/update-manager/release-upgrades
sudo apt-get install -y ubuntu-release-upgrader-core
cd $GITHUB_WORKSPACE/catkin_ws/src/mil
source /opt/ros/noetic/setup.bash
source ../../devel/setup.bash
pylint $(git ls-files "*.py") --jobs=0
rm -rf build devel
export HOME=$GITHUB_WORKSPACE # Temporary fix for setup scripts
./scripts/install.sh
# - name: Run catkin_make
# run: |
# cd $GITHUB_WORKSPACE/catkin_ws
# source /opt/ros/noetic/setup.bash
# catkin_make -DPYTHON_EXECUTABLE=/usr/bin/python3 \
# -DPYTHON_INCLUDE_DIR=/usr/include/python3.8 \
# -j6
- name: Run catkin_make tests
run: |
export HOME=$GITHUB_WORKSPACE # Temporary fix for setup scripts
Expand All @@ -82,7 +76,7 @@ jobs:
source devel/setup.bash
catkin_make -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-DPYTHON_INCLUDE_DIR=/usr/include/python3.8 \
-j6 \
"-j$(($(nproc)-2))" \
run_tests
- name: Get test results
run: >
Expand All @@ -106,13 +100,13 @@ jobs:

deploy-docs:
name: Deploy docs from master
runs-on: ubuntu-latest
runs-on: self-hosted
needs:
- super-ci
if: github.ref == 'refs/heads/master'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Make folders
run: |
Expand All @@ -124,18 +118,17 @@ jobs:
name: docs-ci-html-${{ github.sha }}
path: ${{ github.workspace }}/build/docs

# We need to install rsync for GitHub Pages deploy action
- name: Install rsync
run: |
sudo apt-get upgrade && sudo apt-get update && sudo apt-get install -y rsync
# Publish the artifact to the GitHub Pages branch
- name: Push docs to GitHub Pages
uses: JamesIves/github-pages-deploy-action@v4
with:
token: ${{ secrets.INVESTIGATOR_BOT_TOKEN }}
branch: main
repository-name: uf-mil/uf-mil.github.io
folder: ${{ github.workspace }}/build/docs
target-folder: docs
commit-message: Updating docs to ${{ github.sha }}
- name: Push docs to mil.ufl.edu
run: |
# Install sshpass
sudo apt-get install sshpass
# Upload contents of local folder to remote folder
sshpass -p ${{ secrets.MIL_UFL_SFTP_PASS }} \
sftp -o StrictHostKeyChecking=no \
-P ${{ secrets.MIL_UFL_SFTP_PORT }} mil@mil.ufl.edu << EOF
cd htdocs/docs
lcd ${{ github.workspace }}/build/docs
put -r .
exit
EOF
Loading

0 comments on commit 20c1958

Please sign in to comment.