mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-20 06:56:17 -05:00
ci: align release workflow matrix with build
This commit is contained in:
1 file changed
+11
-7
@@ -73,9 +73,12 @@ jobs:
|
|||||||
const inputs = ${{ toJson(inputs) }}
|
const inputs = ${{ toJson(inputs) }}
|
||||||
const { arch } = inputs
|
const { arch } = inputs
|
||||||
const osMap = {
|
const osMap = {
|
||||||
"all": ["ubuntu-latest", "ubuntu-24.04-arm"],
|
"all": [
|
||||||
"x86_64": ["ubuntu-latest"],
|
{ runner: "ubuntu-latest", arch: "amd64" },
|
||||||
"arm64": ["ubuntu-24.04-arm"]
|
{ runner: "ubuntu-24.04-arm", arch: "ubuntu-24.04-arm" },
|
||||||
|
],
|
||||||
|
"x86_64": [{ runner: "ubuntu-latest", arch: "amd64" }],
|
||||||
|
"arm64": [{ runner: "ubuntu-24.04-arm", arch: "ubuntu-24.04-arm" }],
|
||||||
}
|
}
|
||||||
|
|
||||||
const package = Object.entries(inputs)
|
const package = Object.entries(inputs)
|
||||||
@@ -92,7 +95,8 @@ jobs:
|
|||||||
- setup-matrix
|
- setup-matrix
|
||||||
strategy:
|
strategy:
|
||||||
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
|
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os.runner }}
|
||||||
|
name: build (${{ matrix.package }}, ${{ matrix.os.arch }})
|
||||||
steps:
|
steps:
|
||||||
- name: Prepare workspace
|
- name: Prepare workspace
|
||||||
run: rm -rf build-${{ matrix.package }} && mkdir -p build-${{ matrix.package }}
|
run: rm -rf build-${{ matrix.package }} && mkdir -p build-${{ matrix.package }}
|
||||||
@@ -124,9 +128,9 @@ jobs:
|
|||||||
bash install.sh
|
bash install.sh
|
||||||
|
|
||||||
- name: Upload ${{ matrix.package }} package
|
- name: Upload ${{ matrix.package }} package
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: artifact-${{ matrix.os }}-${{ matrix.package }}
|
name: artifact-${{ matrix.os.arch }}-${{ matrix.package }}
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
path: |
|
path: |
|
||||||
build-${{ matrix.package }}/artifacts/*
|
build-${{ matrix.package }}/artifacts/*
|
||||||
@@ -140,7 +144,7 @@ jobs:
|
|||||||
- name: Prepare workspace
|
- name: Prepare workspace
|
||||||
run: rm -rf gh-release && mkdir gh-release
|
run: rm -rf gh-release && mkdir gh-release
|
||||||
- name: Download artifact
|
- name: Download artifact
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
path: gh-release
|
path: gh-release
|
||||||
- name: Update release
|
- name: Update release
|
||||||
|
|||||||
Reference in new issue
Block a user