diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c8380e9..ccb80a13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,11 +1,11 @@ name: Build driver on: push: - branches: [ main ] + branches: [ main, Release_candidate ] tags: - 'v*' pull_request: - branches: [ main ] + branches: [ main, Release_candidate ] concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} diff --git a/install.sh b/install.sh index e7b55337..9616eebd 100755 --- a/install.sh +++ b/install.sh @@ -205,23 +205,7 @@ fi debug "Installing for platform $ARCH" -# make sure that we are downloading a valid version -if [ "$VERSION" = "latest" ] ; then - RELEASE_URL="https://api.github.com/repos/photonvision/photonvision/releases/latest" -else - RELEASE_URL="https://api.github.com/repos/photonvision/photonvision/releases/tags/$VERSION" -fi - -DOWNLOAD_URL=$(curl -sk "$RELEASE_URL" | - grep "browser_download_url.*$ARCH_NAME.jar" | - cut -d : -f 2,3 | - tr -d '"' - ) - -if [[ -z $DOWNLOAD_URL ]] ; then - die "PhotonVision '$VERSION' is not available for $ARCH_NAME!" \ - "See ./install --list-versions for a list of available versions." -fi +RELEASE_URL="https://api.github.com/repos/photonvision/photonvision/releases" DISTRO=$(lsb_release -is) @@ -285,17 +269,19 @@ EOF fi fi +DOWNLOAD_URL=$(curl -sk "https://api.github.com/repos/photonvision/photonvision/releases" | + grep "browser_download_url.*rc.*linuxarm64.jar" | + cut -d : -f 2,3 | + tr -d '"' | + head -n1) debug "" debug "Downloading PhotonVision '$VERSION'..." +debug "Download URL: $DOWNLOAD_URL" if [[ -z $TEST ]]; then mkdir -p /opt/photonvision cd /opt/photonvision || die "Tried to enter /opt/photonvision, but it was not created." - curl -sk "$RELEASE_URL" | - grep "browser_download_url.*$ARCH_NAME.jar" | - cut -d : -f 2,3 | - tr -d '"' | - wget -qi - -O photonvision.jar + wget -O photonvision.jar $DOWNLOAD_URL fi debug "Downloaded PhotonVision." diff --git a/install_opi5.sh b/install_opi5.sh index 992d70e9..f801ec32 100755 --- a/install_opi5.sh +++ b/install_opi5.sh @@ -102,7 +102,8 @@ apt-get --yes -qq clean rm -rf /usr/share/doc rm -rf /usr/share/locale/ -# One-time setup for the Orange Pi's, needs to be connected to the internet +# One-time setup for the# Update and upgrade +# connected to the internet # make config directory sudo mkdir -p /xbot/config