index on (no branch): 819f120 ext_time_quota_acl: remove -l option (s…

…quid-cache#1909)

.github/workflows/default.yaml

@@ -33,18 +33,18 @@ jobs:
           sudo apt-get --quiet=2 install libtool-bin
 
       - name: Setup a nodejs environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Checkout Squid sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: ${{ env.CHECKOUT_FETCH_DEPTH }}
 
       - run: ./bootstrap.sh
       - run: ./configure --with-openssl
-      - run: make -j2
+      - run: make -j`nproc`
       - run: |
           sudo make install
           sudo chown -R nobody:nogroup /usr/local/squid
@@ -58,65 +58,10 @@ jobs:
 
       - name: Publish test logs
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-logs
           path: |
             ${{ runner.temp }}/*.log
             /usr/local/squid/var/logs/overlord/*.log
 
-  source-maintenance-tests:
-
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Install prerequisite packages
-        run: |
-          sudo apt-get --quiet=2 update
-          sudo apt-get --quiet=2 install astyle
-          sudo apt-get --quiet=2 install gperf
-          pip install \
-              --user \
-              --no-cache-dir \
-              --disable-pip-version-check \
-              --quiet \
-              --progress-bar off \
-              codespell==1.16 # TODO: Upgrade to codespell v2
-
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: ${{ env.CHECKOUT_FETCH_DEPTH }}
-
-      - run: ./test-suite/test-sources.sh
-
-  build-tests:
-
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [ ubuntu-22.04 ]
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-
-      - name: Install prerequisite Linux packages
-        if: runner.os == 'Linux'
-        run: |
-          # required for "apt-get build-dep" to work
-          sudo sed --in-place -E 's/# (deb-src.*updates main)/  \1/g' /etc/apt/sources.list
-          sudo apt-get --quiet=2 update
-          sudo apt-get --quiet=2 build-dep squid
-          sudo apt-get --quiet=2 install linuxdoc-tools
-
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - run: ./test-builds.sh
-
-      - name: Publish build logs
-        if: success() || failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-logs-${{ runner.os }}
-          path: btlayer-*.log

test-suite/test-functionality.sh

@@ -57,11 +57,12 @@ has_commit_by_message() {
 clone_repo() {
     local repo_url="$1"
     local destination_dir="$2"
+    local branch="$3"
 
     if test -e $destination_dir
     then
         echo "Skipping already fetched $destination_dir"
-    elif run git clone --no-tags --quiet --depth=1 --branch production -- "$repo_url" "$destination_dir"
+    elif run git clone --no-tags --quiet --depth=1 --branch "$branch" -- "$repo_url" "$destination_dir"
     then
         if test -e "$destination_dir/package.json"
         then
@@ -93,9 +94,9 @@ start_overlord() {
 setup_test_tools() {
     echo "::group::Setup test tools"
 
-    clone_repo https://github.com/measurement-factory/daft $DAFT_DIR || return
-    clone_repo https://github.com/measurement-factory/squid-dafts $SQUID_DAFTS_DIR || return
-    clone_repo https://github.com/measurement-factory/squid-overlord $SQUID_OVERLORD_DIR || return
+    clone_repo https://github.com/measurement-factory/daft $DAFT_DIR auto || return
+    clone_repo https://github.com/measurement-factory/squid-dafts $SQUID_DAFTS_DIR auto || return
+    clone_repo https://github.com/measurement-factory/squid-overlord $SQUID_OVERLORD_DIR auto || return
 
     if ! test -e $SQUID_DAFTS_DIR/src
     then