From ad13a1f8dfeb444dd8a8af52c00814954900dfca Mon Sep 17 00:00:00 2001 From: Soren Ptak Date: Thu, 9 Nov 2023 15:00:06 -0800 Subject: [PATCH] CI-CD URL Check Change (#880) * Remove the Kernel's custom URL check to just use the CI-CD Actions one * Exclude portable directory from formatting check. --- .github/actions/url_verifier.sh | 65 -------------------------------- .github/workflows/ci.yml | 15 ++------ .github/workflows/formatting.yml | 4 +- 3 files changed, 6 insertions(+), 78 deletions(-) delete mode 100755 .github/actions/url_verifier.sh diff --git a/.github/actions/url_verifier.sh b/.github/actions/url_verifier.sh deleted file mode 100755 index e9804657b..000000000 --- a/.github/actions/url_verifier.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - - -PROJECT=$1 -echo "Verifying url links of: ${PROJECT}" -if [ ! -d "$PROJECT" ] -then - echo "Directory passed does not exist" - exit 2 -fi - -USER_AGENT="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36" -SCRIPT_RET=0 - -set -o nounset # Treat unset variables as an error - -declare -A dict - -function test { - while IFS= read -r LINE; do - FILE=$(echo $LINE | cut -f 1 -d ':') - URL=$(echo $LINE | grep -IoE '\b(https?|ftp|file)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]*[-A-Za-z0-9+&@#/%=~_|]') - - # remove trailing / if it exists curl diferenciate between links with - # and without / at the end - # URL=`echo "$URL" | sed 's,/$,,'` - dict+=(["$URL"]="$FILE ") - done < <(grep -e 'https\?://' ${PROJECT} -RIa --exclude='*.exe' --exclude-dir=.git | tr '*' ' ') - - for UNIQ_URL in ${!dict[@]} # loop urls - do - CURL_RES=$(curl -si --user-agent "${USER_AGENT}" ${UNIQ_URL} 2>/dev/null| head -n 1 | cut -f 2 -d ' ') - RES=$? - - echo "=================================" - echo "Checking URL: ${UNIQ_URL}" - - if [ "${CURL_RES}" == '' -o "${CURL_RES}" != '200' ] - then - if [ "${CURL_RES}" == '' ] # curl returned an error - then - CURL_RES=$RES - SCRIPT_RET=1 - echo ERROR: Result is: "${CURL_RES}" - elif [ "${CURL_RES}" == '403' ] - then - SCRIPT_RET=1 - echo ERROR: Result is: "${CURL_RES}" - else - echo WARNING: Result is: "${CURL_RES}" - fi - else - echo SUCCESS: Result is: "${CURL_RES}" - fi - echo "=================================" - done - - if [ "${SCRIPT_RET}" -eq 0 ] - then - exit 0 - else - exit 1 - fi -} - -test diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46c6f7ee0..bc6d8802b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,8 @@ jobs: - uses: actions/checkout@v3 - name: Check Formatting of FreeRTOS-Kernel Files uses: FreeRTOS/CI-CD-Github-Actions/formatting@main + with: + exclude-dirs: portable spell-check: runs-on: ubuntu-latest @@ -30,18 +32,7 @@ jobs: - name: Clone This Repo uses: actions/checkout@v3 - name: Link Verification - uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@v2 - - url-check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - path: ./kernel - - - name: URL Checker - run: | - bash kernel/.github/actions/url_verifier.sh kernel + uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@main verify-manifest: runs-on: ubuntu-latest diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 04786bad5..14d41c9c0 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -19,5 +19,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Apply Formatting Fix + id: check-formatting uses: FreeRTOS/CI-CD-Github-Actions/formatting-bot@main - id: check-formatting + with: + exclude-dirs: portable