Skip to content

Commit

Permalink
Merge branch 'main' into releases/v1
Browse files Browse the repository at this point in the history
  • Loading branch information
shogo82148 committed Sep 19, 2023
2 parents 35426a5 + f613cf4 commit eeda3cf
Show file tree
Hide file tree
Showing 27 changed files with 1,435 additions and 1,325 deletions.
2 changes: 1 addition & 1 deletion .github/update-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CURRENT=$(cd "$(dirname "$0")" && pwd)
cd "$CURRENT"

set -eu
OPENSSL_VERSION=$(gh api --jq 'last.ref | sub("refs/tags/openssl-"; "")' /repos/openssl/openssl/git/matching-refs/tags/openssl-3.)
OPENSSL_VERSION=$(gh api --jq 'map(select(.ref | test("/openssl-[0-9]+[.][0-9]+[.][0-9]+$"))) | last.ref | sub("refs/tags/openssl-"; "")' /repos/openssl/openssl/git/matching-refs/tags/openssl-3.)
export OPENSSL_VERSION
perl -i -pe 's/^OPENSSL_VERSION=.*$/OPENSSL_VERSION=$ENV{OPENSSL_VERSION}/' build-openssl-darwin.sh
perl -i -pe 's/^OPENSSL_VERSION=.*$/OPENSSL_VERSION=$ENV{OPENSSL_VERSION}/' build-openssl-linux.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
list:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: set-matrix
name: list available perl versions
run: |
Expand All @@ -45,7 +45,7 @@ jobs:
name: check pre-installed perl version
run: |
perl -e 'print "version=$^V\n"' >> "$GITHUB_OUTPUT"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/cache@v3
with:
path: scripts/darwin/local
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
env:
PERL_VERSION: ${{ matrix.perl }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: perl
name: setup host perl
run: |
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
PERL_VERSION: ${{ matrix.perl }}
PERL_MULTI_THREAD: "1"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: perl
name: setup host perl
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
list:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: set-matrix
name: list available perl versions
run: |
Expand All @@ -45,7 +45,7 @@ jobs:
name: check pre-installed perl version
run: |
perl -e 'print "version=$^V\n"' >> "$GITHUB_OUTPUT"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/cache@v3
with:
path: scripts/linux/local
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
env:
PERL_VERSION: ${{ matrix.perl }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: perl
name: setup host perl
run: |
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
PERL_VERSION: ${{ matrix.perl }}
PERL_MULTI_THREAD: "1"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: perl
name: setup host perl
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-cpan-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ jobs:
# - "5.6.0"
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set Node.js 16.x
- name: Set Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version-file: "package.json"
cache: npm

- run: npm ci
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ jobs:
- true
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set Node.js 16.x
- name: Set Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version-file: "package.json"
cache: npm

- run: npm ci
Expand Down Expand Up @@ -108,12 +108,12 @@ jobs:
- true
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set Node.js 16.x
- name: Set Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version-file: "package.json"
cache: npm

- run: npm ci
Expand Down Expand Up @@ -190,12 +190,12 @@ jobs:
run: git config --global core.autocrlf false

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set Node.js 16.x
- name: Set Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version-file: "package.json"
cache: npm

- run: npm ci
Expand Down Expand Up @@ -270,12 +270,12 @@ jobs:
run: git config --global core.autocrlf false

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set Node.js 16.x
- name: Set Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version-file: "package.json"
cache: npm

- run: npm ci
Expand Down Expand Up @@ -342,12 +342,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set Node.js 16.x
- name: Set Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version-file: "package.json"
cache: npm

- run: npm ci
Expand All @@ -368,12 +368,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set Node.js 16.x
- name: Set Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version-file: "package.json"
cache: npm
- run: npm ci
- run: npm run format-check
12 changes: 6 additions & 6 deletions .github/workflows/update-build-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: carton install
shell: bash
Expand All @@ -36,7 +36,7 @@ jobs:
- name: setup host perl
run: perl -MConfig -E 'say "$Config{bin}"' >> "$GITHUB_PATH"
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: carton install
shell: bash
Expand All @@ -54,7 +54,7 @@ jobs:
runs-on: windows-2019
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: setup host perl
shell: bash
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: carton install
shell: bash
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: cleanup
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:

- name: Generate token
id: generate_token
uses: shogo82148/actions-github-app-token@v0
uses: shogo82148/actions-github-app-token@v1

- name: commit
uses: shogo82148/actions-commit-and-create-pr@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-carton.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: main
fetch-depth: 0
Expand All @@ -40,7 +40,7 @@ jobs:

- name: Generate token
id: generate_token
uses: shogo82148/actions-github-app-token@v0
uses: shogo82148/actions-github-app-token@v1

- name: commit
uses: shogo82148/actions-commit-and-create-pr@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-cpanm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: main
fetch-depth: 0
Expand All @@ -40,7 +40,7 @@ jobs:

- name: Generate token
id: generate_token
uses: shogo82148/actions-github-app-token@v0
uses: shogo82148/actions-github-app-token@v1

- name: commit
uses: shogo82148/actions-commit-and-create-pr@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-cpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: main
fetch-depth: 0
Expand All @@ -40,7 +40,7 @@ jobs:

- name: Generate token
id: generate_token
uses: shogo82148/actions-github-app-token@v0
uses: shogo82148/actions-github-app-token@v1

- name: commit
uses: shogo82148/actions-commit-and-create-pr@v1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/win32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
list:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: set-matrix
name: list available perl versions
run: |
Expand All @@ -41,7 +41,7 @@ jobs:
sanity-check:
runs-on: windows-2019
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- id: perl
name: setup host perl
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
env:
PERL_VERSION: ${{ matrix.perl }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: msys2/setup-msys2@v2
with:
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
PERL_VERSION: ${{ matrix.perl }}
PERL_MULTI_THREAD: "1"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: msys2/setup-msys2@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ outputs:
cache-hit:
description: 'A boolean value to indicate if a cache was hit'
runs:
using: "node16"
using: "node20"
main: "dist/setup/index.js"
post: 'dist/cache-save/index.js'
post-if: success()
Expand Down
2 changes: 1 addition & 1 deletion author/carton/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:latest
FROM alpine:3.18.0

# build perl
RUN apk add --no-cache gcc libc-dev curl perl patch make wget
Expand Down
Loading

0 comments on commit eeda3cf

Please sign in to comment.