Skip to content

Commit

Permalink
chore(ci): bump to ubuntu-20.04 and supported openresty versions (#132)
Browse files Browse the repository at this point in the history
  • Loading branch information
fffonion authored Aug 3, 2023
1 parent eb527f3 commit 5e320ee
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/latest_os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
openresty-version: [1.17.8.2]
luarocks-version: [3.7.0]
openresty-version: [1.21.4.1, 1.19.9.1]
luarocks-version: [3.8.0]

steps:
- name: Update and install OS dependencies
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
path: |
${{ env.INSTALL_PATH }}
~/perl5
key: ${{ runner.os }}-${{ hashFiles('.github/workflows/latest_os.yml') }}
key: ${{ runner.os }}-${{ matrix.openresty-version }}-${{ hashFiles('.github/workflows/latest_os.yml') }}

- name: Create needed paths
if: steps.cache-deps.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -104,8 +104,8 @@ jobs:
needs: build
strategy:
matrix:
openresty-version: [1.17.8.2]
luarocks-version: [3.7.0]
openresty-version: [1.21.4.1, 1.19.9.1]
luarocks-version: [3.8.0]
steps:
- name: Checkout lua-resty-healthcheck
uses: actions/checkout@v2
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
path: |
${{ env.INSTALL_PATH }}
~/perl5
key: ${{ runner.os }}-${{ hashFiles('.github/workflows/latest_os.yml') }}
key: ${{ runner.os }}-${{ matrix.openresty-version }}-${{ hashFiles('.github/workflows/latest_os.yml') }}

- name: Lint code
run: |
Expand All @@ -147,8 +147,8 @@ jobs:
needs: build
strategy:
matrix:
openresty-version: [1.17.8.2]
luarocks-version: [3.7.0]
openresty-version: [1.21.4.1, 1.19.9.1]
luarocks-version: [3.8.0]
steps:
- name: Checkout lua-resty-healthcheck
uses: actions/checkout@v2
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
path: |
${{ env.INSTALL_PATH }}
~/perl5
key: ${{ runner.os }}-${{ hashFiles('.github/workflows/latest_os.yml') }}
key: ${{ runner.os }}-${{ matrix.openresty-version }}-${{ hashFiles('.github/workflows/latest_os.yml') }}

- name: Install lua-resty-healthcheck
run: luarocks make
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/old_os.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: Build and test for Ubuntu 18.04
name: Build and test for Ubuntu 20.04

on: [push, pull_request]

jobs:
build:
name: Build and install dependencies
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
openresty-version: [1.13.6.2, 1.15.8.3, 1.17.8.2]
luarocks-version: [3.7.0]
openresty-version: [1.21.4.1, 1.19.9.1]
luarocks-version: [3.8.0]

steps:
- name: Update and install OS dependencies
Expand Down Expand Up @@ -100,12 +100,12 @@ jobs:
lint:
name: Static code analysis
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs: build
strategy:
matrix:
openresty-version: [1.13.6.2, 1.15.8.3, 1.17.8.2]
luarocks-version: [3.7.0]
openresty-version: [1.21.4.1, 1.19.9.1]
luarocks-version: [3.8.0]
steps:
- name: Checkout lua-resty-healthcheck
uses: actions/checkout@v2
Expand Down Expand Up @@ -143,12 +143,12 @@ jobs:
install-and-test:
name: Test lua-resty-healthcheck
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs: build
strategy:
matrix:
openresty-version: [1.13.6.2, 1.15.8.3, 1.17.8.2]
luarocks-version: [3.7.0]
openresty-version: [1.21.4.1, 1.19.9.1]
luarocks-version: [3.8.0]
steps:
- name: Checkout lua-resty-healthcheck
uses: actions/checkout@v2
Expand Down

0 comments on commit 5e320ee

Please sign in to comment.