Skip to content

Commit

Permalink
Spinnaker: Try zstd for uncompromising data.tar.zst. Show dirs in win…
Browse files Browse the repository at this point in the history
…dows installation
  • Loading branch information
jpsacha committed Aug 3, 2024
1 parent ae05c72 commit 34a30f5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/actions/deploy-ubuntu/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ runs:
$SUDO apt-get update
$SUDO apt-get -y install gcc-multilib g++-multilib gfortran-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH libpulse-dev:$ARCH
$SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev libdrm-dev
$SUDO apt-get -y install zstd
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
Expand Down Expand Up @@ -272,10 +273,9 @@ runs:
if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "spinnaker" ]]; then
echo Installing Spinnaker amd64
python3 -m gdown -V
python3 -m gdown 1Xapzvxrgx1w3RCbAOFILaNCZwpusB_VA
tar -xzvf spinnaker-4.0.0.116-amd64-pkg-22.04.tar.gz
find -name *.deb | while read f; do ar -xv $f; $SUDO tar --totals -xvf data.tar.xz -C /; done;
find -name *.deb | while read f; do ar -xv $f; $SUDO tar --totals --use-compress-program=unzstd -xvf data.tar.zst -C /; done;
fi
GRADLE_TASK=publishToMavenLocal
Expand Down
1 change: 0 additions & 1 deletion .github/actions/deploy-windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ runs:
if "%CI_DEPLOY_PLATFORM%"=="windows-x86_64" if "%CI_DEPLOY_MODULE%"=="spinnaker" (
echo Installing Spinnaker x64
python -m gdown -V
python -m gdown 1d0HHDHsPcgs-Pnw0u8KeeFlK79T1DQhf
python -m gdown 18cWXUhL6aFs57Q73aVWT1BF_--pzoMha
rem We can get these msi files by starting the installation from the exe file
Expand Down
3 changes: 3 additions & 0 deletions spinnaker/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ case $PLATFORM in
windows-*)
if [[ ! -d "/C/Program Files/Teledyne/Spinnaker/" ]]; then
echo "Please install Spinnaker under the default installation directory"
ls "/C"
ls "/C/Program Files"
ls "/C/Program Files/Teledyne"
exit 1
fi
;;
Expand Down

0 comments on commit 34a30f5

Please sign in to comment.