From fd68e95aa04185511e3a62b9ba90e9dbf7bf85ad Mon Sep 17 00:00:00 2001 From: Erik Hemming Date: Tue, 1 Oct 2024 18:34:16 +0200 Subject: [PATCH] Fix actions (#10) * update upload-artifact to v3 * Allow curl redirects * Change arm-gcc to arm-none-eabi-gcc@8.2018.4 (macOS) * update checkout to v3 * update upload-artifact to v4 * update checkout to v4 --- .github/workflows/Replay_Boot.yml | 16 ++++++++-------- Replay_Boot/install_arduino_vidor.sh | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Replay_Boot.yml b/.github/workflows/Replay_Boot.yml index a3a3aff..840bfe6 100644 --- a/.github/workflows/Replay_Boot.yml +++ b/.github/workflows/Replay_Boot.yml @@ -16,7 +16,7 @@ jobs: Build_R1_Firmware: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -37,7 +37,7 @@ jobs: mkdir -p $GITHUB_WORKSPACE/artifact find . -maxdepth 1 -type f -name "*.zip" -exec mv {} $GITHUB_WORKSPACE/artifact \; - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: R1_Firmware path: artifact @@ -53,7 +53,7 @@ jobs: Verify_MacOSX_Build: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -65,7 +65,7 @@ jobs: brew tap ArmMbed/homebrew-formulae brew tap-new $USER/armmbed brew extract --version=8-2018-q4-major armmbed/homebrew-formulae/arm-none-eabi-gcc $USER/armmbed - brew install arm-none-eabi-gcc@8-2018-q4-major + brew install arm-none-eabi-gcc@8.2018.4 arm-none-eabi-gcc -v - name: Build @@ -76,7 +76,7 @@ jobs: Verify_Windows_Build: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -95,7 +95,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -111,7 +111,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -132,7 +132,7 @@ jobs: mkdir -p $GITHUB_WORKSPACE/artifact find . -maxdepth 1 -type f -name "*.zip" -exec mv {} $GITHUB_WORKSPACE/artifact \; - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: replay_mkrvidor4000 path: artifact diff --git a/Replay_Boot/install_arduino_vidor.sh b/Replay_Boot/install_arduino_vidor.sh index d737708..c0a1121 100755 --- a/Replay_Boot/install_arduino_vidor.sh +++ b/Replay_Boot/install_arduino_vidor.sh @@ -45,7 +45,7 @@ mkdir -p "$ARDUINO_PATH/portable" if [ ! -f "$ARDUINO_PATH/arduino" ]; then if [[ "$OSTYPE" =~ "linux" ]]; then echo -ne "${ORANGE}DOWNLOADING... \n${LCYAN}" - curl -f -# http://downloads.arduino.cc/arduino-${ARDUINO_IDE_VERSION}-linux64.tar.xz -o arduino.tar.xz 2>&1 + curl -L -f -# http://downloads.arduino.cc/arduino-${ARDUINO_IDE_VERSION}-linux64.tar.xz -o arduino.tar.xz 2>&1 RET=$? echo -ne "${ORANGE} DOWNLOADED " if [ $RET -ne 0 ]; then echo -ne "${FAIL_MSG} "; else echo -ne "${PASS_MSG} "; fi @@ -57,7 +57,7 @@ if [ ! -f "$ARDUINO_PATH/arduino" ]; then if [ -f arduino.tar.xz ]; then rm arduino.tar.xz; fi elif [[ "$OSTYPE" == "msys" ]]; then echo -ne "${ORANGE}DOWNLOADING... \n${LCYAN}" - curl -f -# http://downloads.arduino.cc/arduino-${ARDUINO_IDE_VERSION}-windows.zip -o arduino.zip 2>&1 + curl -L -f -# http://downloads.arduino.cc/arduino-${ARDUINO_IDE_VERSION}-windows.zip -o arduino.zip 2>&1 RET=$? echo -ne "${ORANGE} DOWNLOADED " if [ $RET -ne 0 ]; then echo -ne "${FAIL_MSG} "; else echo -ne "${PASS_MSG} "; fi @@ -71,7 +71,7 @@ if [ ! -f "$ARDUINO_PATH/arduino" ]; then if [ -f arduino.zip ]; then rm arduino.zip; fi elif [[ "$OSTYPE" =~ "darwin" ]]; then echo -ne "${ORANGE}DOWNLOADING... \n${LCYAN}" - curl -f -# http://downloads.arduino.cc/arduino-${ARDUINO_IDE_VERSION}-macosx.zip -o arduino.zip 2>&1 + curl -L -f -# http://downloads.arduino.cc/arduino-${ARDUINO_IDE_VERSION}-macosx.zip -o arduino.zip 2>&1 RET=$? echo -ne "${ORANGE} DOWNLOADED " if [ $RET -ne 0 ]; then echo -ne "${FAIL_MSG} "; else echo -ne "${PASS_MSG} "; fi