Merged

devedse · Feb 17, 2023 · 38794be · 38794be
2 parents 2c3337a + 76a7793
commit 38794be
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 45 deletions.
diff --git a/.github/workflows/githubactionsbuilds.yml b/.github/workflows/githubactionsbuilds.yml
@@ -19,14 +19,15 @@ jobs:
     needs: generate_version_number
     runs-on: windows-2022
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET Core @ Latest
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v3
       with:
-        java-version: '15' # The JDK version to make available on the path.
+        distribution: 'zulu'
+        java-version: '19' # The JDK version to make available on the path.
         java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
         architecture: x64 # (x64 or x86) - defaults to x64
     - name: Install tools
@@ -51,7 +52,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: dotnet-sonarscanner end /d:sonar.login=${{secrets.SONARQUBETOKEN}}
     - name: Run CodeCov #codecov -f ".\DeveImageOptimizer.Tests\TestResults\Coverage\coverage.opencover.xml"
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
       with:
         #token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
         files: .\DeveImageOptimizer.Tests\TestResults\Coverage\coverage.opencover.xml # optional
@@ -64,11 +65,11 @@ jobs:
     needs: generate_version_number
     runs-on: windows-2022
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0 # We need to fetch the entire Git history in order to verify the authenticity.
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
     - name: Build with dotnet
@@ -80,9 +81,9 @@ jobs:
     needs: generate_version_number
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
     - name: dotnet restore
@@ -96,9 +97,9 @@ jobs:
     needs: generate_version_number
     runs-on: windows-2022
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET Core @ Latest
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
     - name: dotnet restore
@@ -115,15 +116,15 @@ jobs:
       run: .\Scripts\GoPackage.ps1
       shell: powershell
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: DeveImageOptimizer7z
         path: ./Scripts/Output/DeveImageOptimizer.7z
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: DeveImageOptimizerZip
         path: ./Scripts/Output/DeveImageOptimizer.zip
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: DeveImageOptimizerNuGet
         path: |
@@ -136,7 +137,7 @@ jobs:
     if: github.ref == 'refs/heads/master'
     steps:
     - name: Download all artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         path: ./artifacts/
 
@@ -175,7 +176,7 @@ jobs:
     if: github.ref == 'refs/heads/master'
     steps:
     - name: Download all artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: DeveImageOptimizerNuGet
         path: ./artifacts/DeveImageOptimizerNuGet/

diff --git a/.github/workflows/githubactionsdockertest.yml b/.github/workflows/githubactionsdockertest.yml
@@ -21,23 +21,23 @@ jobs:
     needs: generate_version_number
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Login to Docker Hub
       uses: docker/login-action@v1
       with:
         username: devedse
         password: ${{ secrets.DOCKERHUBTOKEN }}
     - name: Set up QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         image: tonistiigi/binfmt:latest
         platforms: all
     - name: Available platforms
       run: echo ${{ steps.qemu.outputs.platforms }}
     - name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
     - name: Builder instance name
       run: echo ${{ steps.buildx.outputs.name }}
     - name: Available platforms
@@ -52,23 +52,23 @@ jobs:
     needs: generate_version_number
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Login to Docker Hub
       uses: docker/login-action@v1
       with:
         username: devedse
         password: ${{ secrets.DOCKERHUBTOKEN }}
     - name: Set up QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         image: tonistiigi/binfmt:qemu-v5.2.0
         platforms: all
     - name: Available platforms
       run: echo ${{ steps.qemu.outputs.platforms }}
     - name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
     - name: Builder instance name
       run: echo ${{ steps.buildx.outputs.name }}
     - name: Available platforms
@@ -83,23 +83,23 @@ jobs:
     needs: generate_version_number
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Login to Docker Hub
       uses: docker/login-action@v1
       with:
         username: devedse
         password: ${{ secrets.DOCKERHUBTOKEN }}
     - name: Set up QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         image: crazymax/binfmt:v6.0.0-rc4
         platforms: all
     - name: Available platforms
       run: echo ${{ steps.qemu.outputs.platforms }}
     - name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
     - name: Builder instance name
       run: echo ${{ steps.buildx.outputs.name }}
     - name: Available platforms
@@ -114,23 +114,23 @@ jobs:
     needs: generate_version_number
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Login to Docker Hub
       uses: docker/login-action@v1
       with:
         username: devedse
         password: ${{ secrets.DOCKERHUBTOKEN }}
     - name: Set up QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         image: tonistiigi/binfmt:qemu-v6.0.0
         platforms: all
     - name: Available platforms
       run: echo ${{ steps.qemu.outputs.platforms }}
     - name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
     - name: Builder instance name
       run: echo ${{ steps.buildx.outputs.name }}
     - name: Available platforms
@@ -145,7 +145,7 @@ jobs:
     needs: generate_version_number
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Login to Docker Hub
       uses: docker/login-action@v1
       with:
@@ -156,7 +156,7 @@ jobs:
         docker run --rm --privileged aptman/qus -s -- -p
     - name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
     - name: Builder instance name
       run: echo ${{ steps.buildx.outputs.name }}
     - name: Available platforms
@@ -171,10 +171,10 @@ jobs:
     needs: [generate_version_number, build_docker_linux]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         image: tonistiigi/binfmt:latest
         platforms: all
@@ -188,10 +188,10 @@ jobs:
     needs: [generate_version_number, build_docker_linux]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         image: tonistiigi/binfmt:qemu-v5.2.0
         platforms: all
@@ -205,10 +205,10 @@ jobs:
     needs: [generate_version_number, build_docker_linux]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         image: crazymax/binfmt:v6.0.0-rc4
         platforms: all
@@ -222,10 +222,10 @@ jobs:
     needs: [generate_version_number, build_docker_linux]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         image: tonistiigi/binfmt:qemu-v6.0.0
         platforms: all
@@ -239,7 +239,7 @@ jobs:
     needs: [generate_version_number, build_docker_linux]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup qus
       run: |
         docker run --rm --privileged aptman/qus -s -- -p
@@ -253,7 +253,7 @@ jobs:
     needs: [generate_version_number, build_docker_linux]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Test docker run
       run: |
         docker pull --platform linux/arm64 devedse/deveimageoptimizerconsoleapp
@@ -264,7 +264,7 @@ jobs:
     needs: [generate_version_number, build_docker_linux]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Test docker run
       run: |
         docker pull --platform linux/amd64 devedse/deveimageoptimizerconsoleapp
@@ -275,7 +275,7 @@ jobs:
     needs: generate_version_number
     runs-on: windows-2022
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     # - name: Login to Docker Hub
     #   uses: docker/login-action@v1
     #   with:
@@ -285,15 +285,15 @@ jobs:
       run: echo ${{ secrets.DOCKERHUBTOKEN }} | docker login -u devedse --password-stdin
     # - name: Set up QEMU
     #   id: qemu
-    #   uses: docker/setup-qemu-action@v1
+    #   uses: docker/setup-qemu-action@v2
     #   with:
     #     image: tonistiigi/binfmt:latest
     #     platforms: all
     # - name: Available platforms
     #   run: echo ${{ steps.qemu.outputs.platforms }}
     # - name: Set up Docker Buildx
     #   id: buildx
-    #   uses: docker/setup-buildx-action@v1
+    #   uses: docker/setup-buildx-action@v2
     # - name: Builder instance name
     #   run: echo ${{ steps.buildx.outputs.name }}
     # - name: Available platforms