index : static-web-server.git

981c3888102a36f133f149ada3a3464ffe0a53dc [patch]

fc9dab616b05febbe0fb336e068b39530cafa4ae

2bebec7cce410db52774996d255540bae2023906

981c3888102a36f133f149ada3a3464ffe0a53dc.tar.gz

chore: ci runner images & dependency updates

- ubuntu-22.04
- macOS-12
- windows-2022

Diff

 .github/workflows/audit.yml          |  4 ++--
 .github/workflows/devel.docker.yml   | 10 +++++-----
 .github/workflows/devel.yml          | 38 ++++++++++++++++++-------------------
 .github/workflows/release.crate.yml  | 38 ++++++++++++++++++-------------------
 .github/workflows/release.docker.yml | 12 ++++++------
 .github/workflows/release.yml        | 38 ++++++++++++++++++-------------------
 6 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index 48e8640..5888584 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -17,9 +17,9 @@ on:

jobs:
  audit:
    runs-on: ubuntu-20.04
    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v2
      - uses: actions/checkout@v3
      - uses: actions-rs/audit-check@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/devel.docker.yml b/.github/workflows/devel.docker.yml
index b2216ee..80a81b8 100644
--- a/.github/workflows/devel.docker.yml
+++ b/.github/workflows/devel.docker.yml
@@ -21,7 +21,7 @@ jobs:
          - linux/arm64
          - linux/arm/v7
          - linux/arm/v6
    runs-on: ubuntu-20.04
    runs-on: ubuntu-22.04
    services:
      registry:
        image: registry:2
@@ -39,7 +39,7 @@ jobs:
          fetch-depth: 1
      -
        name: Cache Docker layers
        uses: actions/cache@v2
        uses: actions/cache@v3
        with:
          path: /tmp/.buildx-cache
          key: static-web-server-${{ matrix.arch }}-buildx-${{ github.sha }}
@@ -51,7 +51,7 @@ jobs:
      -
        name: Docker meta alpine
        id: meta_alpine
        uses: docker/metadata-action@v3
        uses: docker/metadata-action@v4
        with:
          images: ${{ env.DOCKER_IMAGE }}
          flavor: |
@@ -82,7 +82,7 @@ jobs:
          echo "SERVER_DOCKERFILE=./docker/alpine/Dockerfile" >> $GITHUB_ENV
      -
        name: Build and export to Docker client
        uses: docker/build-push-action@v3
        uses: docker/build-push-action@v4
        with:
          context: .
          platforms: ${{ matrix.arch }}
@@ -94,7 +94,7 @@ jobs:
            SERVER_VERSION=${{ env.SERVER_VERSION }}
      -
        name: Build and push to local registry
        uses: docker/build-push-action@v3
        uses: docker/build-push-action@v4
        with:
          context: .
          platforms: ${{ matrix.arch }}
diff --git a/.github/workflows/devel.yml b/.github/workflows/devel.yml
index 7da2397..4944b21 100644
--- a/.github/workflows/devel.yml
+++ b/.github/workflows/devel.yml
@@ -52,50 +52,50 @@ jobs:
        include:
          # Specific Rust channels
          - build: pinned
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: 1.66.0
          - build: stable
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
          - build: beta
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: beta
          # Some of our release builds are generated by a nightly compiler to take
          # advantage of the latest optimizations/compile time improvements.
          - build: linux-musl
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: x86_64-unknown-linux-musl
          - build: linux-musl-i686
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: i686-unknown-linux-musl
          - build: linux-musl-arm64
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: aarch64-unknown-linux-musl
          - build: linux-gnu
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: x86_64-unknown-linux-gnu
          - build: linux-gnu-i686
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: i686-unknown-linux-gnu
          - build: linux-gnu-arm64
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: aarch64-unknown-linux-gnu
          - build: linux-arm-gnueabihf
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: arm-unknown-linux-gnueabihf
          - build: linux-musl-armv6
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: arm-unknown-linux-musleabihf
          - build: linux-musl-armv7
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: armv7-unknown-linux-musleabihf
          #  NOTE: looks like not supported by `listenfd` crate
@@ -108,26 +108,26 @@ jobs:
            rust: stable
            target: aarch64-linux-android
          - build: macos
            os: macos-11
            os: macos-12
            rust: stable
            target: x86_64-apple-darwin
          - build: macos-arm64
            os: macos-11
            os: macos-12
            rust: stable
            target: aarch64-apple-darwin
          - build: windows-msvc
            os: windows-2019
            os: windows-2022
            rust: stable
            target: x86_64-pc-windows-msvc
          - build: windows-msvc-i686
            os: windows-2019
            os: windows-2022
            rust: stable
            target: i686-pc-windows-msvc
          - build: windows-pc-gnu
            os: windows-2019
            os: windows-2022
            rust: stable-x86_64-gnu
          # - build: windows-msvc-arm64
          #   os: windows-2019
          #   os: windows-2022
          #   rust: stable
          #   target: aarch64-pc-windows-msvc

@@ -185,7 +185,7 @@ jobs:

  checks:
    name: checks
    runs-on: ubuntu-20.04
    runs-on: ubuntu-22.04

    steps:
    - name: Checkout repository
diff --git a/.github/workflows/release.crate.yml b/.github/workflows/release.crate.yml
index 6010d91..91458e5 100644
--- a/.github/workflows/release.crate.yml
+++ b/.github/workflows/release.crate.yml
@@ -22,7 +22,7 @@ jobs:
  checks:
    name: checks
    if: needs.check-secret.outputs.publish == 'true'
    runs-on: ubuntu-20.04
    runs-on: ubuntu-22.04

    steps:
      - name: Checkout repository
@@ -88,73 +88,73 @@ jobs:
        include:
          # Specific Rust channels
          - build: pinned
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: 1.66.0
          - build: stable
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
          - build: beta
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: beta
          # Some of our release builds are generated by a nightly compiler to take
          # advantage of the latest optimizations/compile time improvements.
          - build: linux-musl
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: x86_64-unknown-linux-musl
          - build: linux-musl-i686
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: i686-unknown-linux-musl
          - build: linux-musl-arm64
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: aarch64-unknown-linux-musl
          - build: linux-gnu
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: x86_64-unknown-linux-gnu
          - build: linux-gnu-i686
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: i686-unknown-linux-gnu
          - build: linux-gnu-arm64
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: aarch64-unknown-linux-gnu
          - build: linux-arm-gnueabihf
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: arm-unknown-linux-gnueabihf
          - build: linux-musl-armv6
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: arm-unknown-linux-musleabihf
          - build: linux-musl-armv7
            os: ubuntu-20.04
            os: ubuntu-22.04
            rust: stable
            target: armv7-unknown-linux-musleabihf
          - build: macos
            os: macos-11
            os: macos-12
            rust: stable
            target: x86_64-apple-darwin
          - build: macos-arm64
            os: macos-11
            os: macos-12
            rust: stable
            target: aarch64-apple-darwin
          - build: windows-msvc
            os: windows-2019
            os: windows-2022
            rust: stable
            target: x86_64-pc-windows-msvc
          - build: windows-msvc-i686
            os: windows-2019
            os: windows-2022
            rust: stable
            target: i686-pc-windows-msvc
          - build: windows-pc-gnu
            os: windows-2019
            os: windows-2022
            rust: stable-x86_64-gnu
          # - build: windows-msvc-arm64
          #   os: windows-2019
          #   os: windows-2022
          #   rust: stable
          #   target: aarch64-pc-windows-msvc

diff --git a/.github/workflows/release.docker.yml b/.github/workflows/release.docker.yml
index d6f04a7..2e0eb8b 100644
--- a/.github/workflows/release.docker.yml
+++ b/.github/workflows/release.docker.yml
@@ -6,7 +6,7 @@ on:

jobs:
  docker-image-alpine:
    runs-on: ubuntu-20.04
    runs-on: ubuntu-22.04
    if: contains(github.ref, 'v2.')
    steps:
      -
@@ -18,7 +18,7 @@ jobs:
      -
        name: Docker meta alpine
        id: meta_alpine
        uses: docker/metadata-action@v3
        uses: docker/metadata-action@v4
        with:
          images: joseluisq/static-web-server
          flavor: |
@@ -45,7 +45,7 @@ jobs:
          echo "SERVER_DOCKERFILE=./docker/alpine/Dockerfile" >> $GITHUB_ENV
      -
        name: Build and push (alpine)
        uses: docker/build-push-action@v3
        uses: docker/build-push-action@v4
        with:
          push: true
          context: .
@@ -57,7 +57,7 @@ jobs:

  docker-image-scratch:
    needs: ['docker-image-alpine']
    runs-on: ubuntu-20.04
    runs-on: ubuntu-22.04
    steps:
      -
        name: Checkout repository
@@ -68,7 +68,7 @@ jobs:
      -
        name: Docker meta scratch
        id: meta_scratch
        uses: docker/metadata-action@v3
        uses: docker/metadata-action@v4
        with:
          images: joseluisq/static-web-server
          tags: |
@@ -92,7 +92,7 @@ jobs:
          echo "SERVER_DOCKERFILE=./docker/scratch/Dockerfile" >> $GITHUB_ENV
      -
        name: Build and push (scratch)
        uses: docker/build-push-action@v3
        uses: docker/build-push-action@v4
        with:
          push: true
          context: .
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 420beb1..121e873 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
jobs:
  create-release:
    name: create-release
    runs-on: ubuntu-20.04
    runs-on: ubuntu-22.04
    outputs:
      upload_url: ${{ steps.release.outputs.upload_url }}
      sws_version: ${{ env.SWS_VERSION }}
@@ -70,39 +70,39 @@ jobs:
          # - windows-msvc-arm64
        include:
        - build: linux-musl
          os: ubuntu-20.04
          os: ubuntu-22.04
          rust: stable
          target: x86_64-unknown-linux-musl
        - build: linux-musl-i686
          os: ubuntu-20.04
          os: ubuntu-22.04
          rust: stable
          target: i686-unknown-linux-musl
        - build: linux-musl-arm64
          os: ubuntu-20.04
          os: ubuntu-22.04
          rust: stable
          target: aarch64-unknown-linux-musl
        - build: linux-gnu
          os: ubuntu-20.04
          os: ubuntu-22.04
          rust: stable
          target: x86_64-unknown-linux-gnu
        - build: linux-gnu-i686
          os: ubuntu-20.04
          os: ubuntu-22.04
          rust: stable
          target: i686-unknown-linux-gnu
        - build: linux-gnu-arm64
          os: ubuntu-20.04
          os: ubuntu-22.04
          rust: stable
          target: aarch64-unknown-linux-gnu
        - build: linux-arm-gnueabihf
          os: ubuntu-20.04
          os: ubuntu-22.04
          rust: stable
          target: arm-unknown-linux-gnueabihf
        - build: linux-musl-armv6
          os: ubuntu-20.04
          os: ubuntu-22.04
          rust: stable
          target: arm-unknown-linux-musleabihf
        - build: linux-musl-armv7
          os: ubuntu-20.04
          os: ubuntu-22.04
          rust: stable
          target: armv7-unknown-linux-musleabihf
        # - build: linux-android-armv7
@@ -114,33 +114,33 @@ jobs:
          rust: stable
          target: aarch64-linux-android
        - build: macos
          os: macos-11
          os: macos-12
          rust: stable
          target: x86_64-apple-darwin
        - build: macos-arm64
          os: macos-11
          os: macos-12
          rust: stable
          target: aarch64-apple-darwin
        - build: windows-msvc
          os: windows-2019
          os: windows-2022
          rust: stable
          target: x86_64-pc-windows-msvc
        - build: windows-msvc-i686
          os: windows-2019
          os: windows-2022
          rust: stable
          target: i686-pc-windows-msvc
        - build: windows-pc-gnu
          os: windows-2019
          os: windows-2022
          rust: stable-x86_64-gnu
          target: x86_64-pc-windows-gnu
        # - build: windows-msvc-arm64
        #   os: windows-2019
        #   os: windows-2022
        #   rust: stable
        #   target: aarch64-pc-windows-msvc

    steps:
    - name: Checkout repository
      uses: actions/checkout@v2
      uses: actions/checkout@v3
      with:
        fetch-depth: 1

@@ -157,7 +157,7 @@ jobs:
    - name: Set up Cross
      shell: bash
      run: |
        if [ "${{ matrix.os }}" = "ubuntu-20.04" ]; then
        if [ "${{ matrix.os }}" = "ubuntu-22.04" ]; then
          # Use 'cargo.sh' script for Android targets only
          if [[ "${{ matrix.build }}" == "linux-android-armv7" ]] || [[ "${{ matrix.build }}" == "linux-android-arm64" ]]; then
            echo "CARGO_BIN=ci/cargo.sh" >> $GITHUB_ENV
@@ -187,7 +187,7 @@ jobs:

        cp {README.md,LICENSE-APACHE,LICENSE-MIT} "$staging/"

        if [ "${{ matrix.os }}" = "windows-2019" ]; then
        if [ "${{ matrix.os }}" = "windows-2022" ]; then
          cp "target/${{ matrix.target }}/release/static-web-server.exe" "$staging/"
          7z a "$staging.zip" "$staging"
          echo "ASSET=$staging.zip" >> $GITHUB_ENV