Skip to content

Commit f7f8c63

Browse files
committed
fix build
1 parent 0113798 commit f7f8c63

2 files changed

Lines changed: 13 additions & 20 deletions

File tree

.github/workflows/release_docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ concurrency:
2424
cancel-in-progress: true
2525

2626
env:
27-
GHCR_ORG_NAME: ${{ vars.GHCR_ORG_NAME || 'openlistteam' }}
27+
GHCR_ORG_NAME: ${{ vars.GHCR_ORG_NAME || 'nbtca' }}
2828
IMAGE_NAME: openlist
2929
REGISTRY: ghcr.io
3030
ARTIFACT_NAME: 'binaries_docker_release'

.github/workflows/release_docker_win.yml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
description: "Tag name (like v0.1.0). Required if as_latest is true."
88
required: false
99
type: string
10+
default: latest
1011
as_latest:
1112
description: "Tag as latest?"
1213
required: true
@@ -15,15 +16,6 @@ on:
1516
options:
1617
- "true"
1718
- "false"
18-
windows_version:
19-
description: "Windows Server version"
20-
required: true
21-
default: "ltsc2025"
22-
type: choice
23-
options:
24-
- "ltsc2025"
25-
- "ltsc2022"
26-
- "ltsc2019"
2719
push:
2820
tags:
2921
- "v*"
@@ -33,7 +25,7 @@ concurrency:
3325
cancel-in-progress: true
3426

3527
env:
36-
GHCR_ORG_NAME: ${{ vars.GHCR_ORG_NAME || 'openlistteam' }}
28+
GHCR_ORG_NAME: ${{ vars.GHCR_ORG_NAME || 'nbtca' }}
3729
IMAGE_NAME: openlist
3830
REGISTRY: ghcr.io
3931
IMAGE_PUSH: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
@@ -44,7 +36,7 @@ permissions:
4436
jobs:
4537
release_docker_windows:
4638
name: Release Windows Docker image
47-
runs-on: windows-2022
39+
runs-on: windows-${{ matrix.windows_version }}
4840
strategy:
4941
matrix:
5042
windows_version: ["ltsc2025", "ltsc2022", "ltsc2019"]
@@ -64,16 +56,17 @@ jobs:
6456
id: tag
6557
shell: pwsh
6658
run: |
67-
if ("${{ github.event_name }}" -eq "workflow_dispatch") {
68-
$tag = "${{ github.event.inputs.manual_tag }}"
69-
$windowsVersion = "${{ github.event.inputs.windows_version }}"
59+
$tag = "${{ github.ref_name }}"
60+
$windowsVersion = "${{ matrix.windows_version }}"
61+
62+
$isPush = "${{ github.event_name == 'push' }}"
63+
$isManualLatest = "${{ github.event.inputs.as_latest == 'true' }}"
64+
if ($isPush -eq "true" -or $isManualLatest -eq "true") {
65+
$isLatest = "true"
7066
} else {
71-
$tag = "${{ github.ref_name }}"
72-
$windowsVersion = "${{ matrix.windows_version }}"
67+
$isLatest = "false"
7368
}
74-
75-
$isLatest = "${{ github.event_name == 'push' || github.event.inputs.as_latest == 'true' }}"
76-
69+
7770
echo "tag=$tag" >> $env:GITHUB_OUTPUT
7871
echo "windows_version=$windowsVersion" >> $env:GITHUB_OUTPUT
7972
echo "is_latest=$isLatest" >> $env:GITHUB_OUTPUT

0 commit comments

Comments
 (0)