From 518cf35935cd7b97eb16f08d2174f7ffa6bc6313 Mon Sep 17 00:00:00 2001 From: Wilson Lin Date: Tue, 6 Apr 2021 18:50:24 +1000 Subject: [PATCH] Use fixed OS versions --- .github/workflows/bench.yaml | 2 +- .github/workflows/cli.yml | 8 ++++---- .github/workflows/java.yml | 10 +++++----- .github/workflows/nodejs.yml | 8 ++++---- .github/workflows/python.yml | 2 +- .github/workflows/ruby.yml | 8 ++++---- version | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/bench.yaml b/.github/workflows/bench.yaml index 92811a9..7cee337 100644 --- a/.github/workflows/bench.yaml +++ b/.github/workflows/bench.yaml @@ -9,7 +9,7 @@ on: jobs: bench: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 756515b..2284dd3 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -12,17 +12,17 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-11.0, ubuntu-18.04, windows-2019] include: - - os: macos-latest + - os: macos-11.0 ARCH: macos-x86_64 MIME: application/octet-stream EXT: '' - - os: ubuntu-latest + - os: ubuntu-18.04 ARCH: linux-x86_64 MIME: application/octet-stream EXT: '' - - os: windows-latest + - os: windows-2019 ARCH: windows-x86_64 MIME: application/vnd.microsoft.portable-executable EXT: '.exe' diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index d35b126..05ea04e 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -12,15 +12,15 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-11.0, ubuntu-18.04, windows-2019] include: - - os: macos-latest + - os: macos-11.0 ARCH: macos-x86_64 FILE: 'libminify_html_java.dylib' - - os: ubuntu-latest + - os: ubuntu-18.04 ARCH: linux-x86_64 FILE: 'libminify_html_java.so' - - os: windows-latest + - os: windows-2019 ARCH: windows-x86_64 FILE: 'minify_html_java.dll' steps: @@ -56,7 +56,7 @@ jobs: name: ${{ matrix.ARCH }} path: ./java/target/rust/release/${{ matrix.FILE }} package: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 needs: build steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index a41c8ad..5e178df 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -12,13 +12,13 @@ jobs: strategy: matrix: feature: [core, js] - os: [macos-11.0, ubuntu-latest, windows-latest] + os: [macos-11.0, ubuntu-18.04, windows-2019] include: - os: macos-11.0 ARCH: macos-x86_64 - - os: ubuntu-latest + - os: ubuntu-18.04 ARCH: linux-x86_64 - - os: windows-latest + - os: windows-2019 ARCH: windows-x86_64 runs-on: ${{ matrix.os }} steps: @@ -76,7 +76,7 @@ jobs: strategy: matrix: feature: [core, js] - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 needs: build steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 2c2c282..0f4ca6a 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: feature: [core, js] - os: [macos-11.0, ubuntu-latest, windows-latest] + os: [macos-11.0, ubuntu-20.04, windows-2019] python: [3.7, 3.8, 3.9] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 63701cd..867acff 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -12,13 +12,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-18.04, macos-11.0] ruby: [2.5.7, 2.6.5, 2.7.0] include: - - os: ubuntu-latest + - os: ubuntu-18.04 NAME: linux FILE: 'libminify_html_ruby_lib.so' - - os: macos-latest + - os: macos-11.0 NAME: macos FILE: 'libminify_html_ruby_lib.dylib' steps: @@ -95,7 +95,7 @@ jobs: b2 upload-file ${{ secrets.CICD_CLI_B2_BUCKET_NAME }} ./ruby/target/release/${{ matrix.FILE }} minify-html/bin/ruby/${{ steps.version.outputs.VERSION }}/${{ steps.native_file.outputs.NAME }} package: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 needs: build steps: - uses: actions/checkout@v1 diff --git a/version b/version index cc328e9..aba9cdf 100755 --- a/version +++ b/version @@ -90,7 +90,7 @@ for (const f of ['java/pom.xml', 'README.md']) { } for (const f of ['nodejs/package.json.gen.js']) { - replaceInFile(f, /^(\s*"version": )"\d+\.\d+\.\d+",\s*$/m, `$1"${NEW_VERSION}",`); + replaceInFile(f, /^(\s*version: )"\d+\.\d+\.\d+",\s*$/m, `$1"${NEW_VERSION}",`); } for (const f of ['ruby/minify_html.gemspec']) {