[alpine.Dockerfile] Fix Alpine Linux build & test ; [.github/workflows/github-actions.yml] Install with vcpkg ; [acquire/acquire_crc32c.h] Remove debug statement

Author: SamuelMarks

.github/workflows/github-actions.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     name: ${{ matrix.os }}
 
@@ -22,7 +22,7 @@ jobs:
         run: mkdir build
 
       - name: Install dependencies for macOS
-        run: brew install pkg-config libarchive
+        run: brew install libarchive libbsd pkg-config
         if: matrix.os == 'macos-latest'
 
       - name: Install dependencies for Ubuntu
@@ -54,13 +54,9 @@ jobs:
         run: ./vcpkg/bootstrap-vcpkg.sh
         if: matrix.os != 'windows-latest'
 
-      - name: Install vcpkg ports (Windows) --triplet "${{ runner.arch }}-${{ runner.os }}"
+      - name: Install vcpkg ports --triplet "${{ runner.arch }}-${{ runner.os }}"
         run: ./vcpkg/vcpkg install --classic $(jq -r '.dependencies[] | select(type == "string")' vcpkg.json)
-        if: matrix.os == 'windows-latest' && steps.cache-vcpkg.outputs.cache-hit != 'true'
-
-      - name: Install vcpkg ports (macOS, Linux)
-        run: jq '.dependencies[] | select(type == "string")' vcpkg.json | xargs ./vcpkg/vcpkg install --classic
-        if: matrix.os != 'windows-latest' && steps.cache-vcpkg.outputs.cache-hit != 'true'
+        if: steps.cache-vcpkg.outputs.cache-hit != 'true'
 
       - name: configure (with vcpkg on Windows)
         working-directory: ./build
@@ -90,7 +86,7 @@ jobs:
       - name: release (Ubuntu)
         working-directory: ./build
         run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" > .token
+          printf '%s' "${{ secrets.GITHUB_TOKEN }}" > .token
           gh auth login --with-token < .token
           rm .token
           gh release delete -y amalgamation || true

acquire/acquire_crc32c.h

@@ -140,7 +140,6 @@ bool crc32c(const char *const filename, const char *const hash) {
   fclose(fh);
 
   snprintf(computed, sizeof(computed), "%08x", crc32_res);
-  fprintf(stderr, "computed: \"%s\"\n", computed);
   return strcmp(computed, hash) == 0;
 }
 

alpine.Dockerfile

@@ -1,23 +1,43 @@
 FROM alpine
 
 RUN apk add --no-cache \
+    bash \
+    build-base \
     cmake \
+    curl \
     curl-dev \
+    g++ \
     gcc \
+    git \
     libarchive-dev \
     libbsd-dev \
-    rhash-dev \
     linux-headers \
     make \
     musl-dev \
+    ninja-build \
     openssl-dev \
-    pkgconf
+    perl \
+    pkgconf \
+    python3 \
+    rhash-dev \
+    sudo \
+    unzip \
+    zip && \
+    ln -s /usr/lib/ninja-build/bin/ninja /usr/bin/ninja
+RUN echo -DCMAKE_C_COMPILER="$(which gcc)" -DCMAKE_CXX_COMPILER="$(which gcc)" -DCMAKE_MAKE_PROGRAM="$(which ninja)"
+WORKDIR /
+RUN git clone --depth=1 --single-branch https://github.com/offscale/vcpkg -b project0 && \
+    cd vcpkg && \
+    ./bootstrap-vcpkg.sh -disableMetrics && \
+    ./vcpkg install kubazip libarchive rhash
 
 COPY . /libacquire
 
 WORKDIR /libacquire/build
 
-RUN cmake -DCMAKE_BUILD_TYPE="Debug" .. && \
+RUN cmake -DCMAKE_BUILD_TYPE='Debug' \
+          -DCMAKE_TOOLCHAIN_FILE='/vcpkg/scripts/buildsystems/vcpkg.cmake' \
+          .. && \
     cmake --build .
 
 CMD ctest .