test

vegardit · Jan 8, 2024 · 4c47db8 · 4c47db8
1 parent b24015e
commit 4c47db8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 36 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,9 +54,6 @@ jobs:
       matrix:
         os:
         - ubuntu-latest
-        - ubuntu-22.04
-        - ubuntu-20.04
-        - windows-latest
 
     steps:
     - name: Git Checkout
@@ -90,6 +87,7 @@ jobs:
     - name: Run tests
       timeout-minutes: 5
       run: |
+        bash fast-apt-mirror.sh current
         set -eu
         if [[ "${{ runner.os }}" == "Linux" && "${{ env.ACT }}" != "true" ]]; then
           bashcov --skip-uncovered tests/run-tests.sh
@@ -121,35 +119,3 @@ jobs:
       if: always() && steps.debug_ssh_sesssion_check.outputs.start_session
       with:
         limit-access-to-actor: ${{ inputs.debug-with-ssh-only-for-actor }}
-
-  test-containers:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        image:
-        - debian:unstable-slim
-        - debian:testing-slim
-        - debian:stable-slim
-        - debian:bookworm-slim
-        - debian:bullseye-slim
-        - debian:buster-slim
-        - "bitnami/minideb:latest"
-        - "bitnami/minideb:bookworm"
-        - "bitnami/minideb:bullseye"
-        - "bitnami/minideb:buster"
-        - "kalilinux/kali-last-release:latest"
-        - ubuntu:devel
-        - ubuntu:latest
-        - ubuntu:22.04
-        - ubuntu:20.04
-        - ubuntu:18.04
-        - ubuntu:16.04
-
-    steps:
-    - name: Git Checkout
-      uses: actions/checkout@v4 #https://github.com/actions/checkout
-
-    - name: Run tests in [${{ matrix.image }}]
-      timeout-minutes: 5
-      run: bash tests/run-tests-in-docker.sh ${{ matrix.image }}
diff --git a/fast-apt-mirror.sh b/fast-apt-mirror.sh
@@ -454,7 +454,9 @@ function set_mirror() {
 case ${1:-} in
   find)    shift; find_fast_mirror "$@" ;;
   set)     shift; set_mirror "$@" ;;
-  current) shift; get_current_mirror "$@" | head -n 1 ;;
+  current) shift;
+    get_current_mirror "$@" ;
+    get_current_mirror "$@" | head -n 1 ;;
   *) [[ "${1:-}" == "--help" ]] || ( echo "ERROR: Required command missing"; echo )
      echo "Usage: $(basename "$0") COMMAND";
      echo