Skip to content

Commit 5c0b762

Browse files
committed
re-generate descriptive & permalink names
1 parent 23f1db2 commit 5c0b762

5 files changed

Lines changed: 36 additions & 50 deletions

File tree

.github/workflows/build-linux-x64.yml

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
# -----------------------------------------------------------------------------
2828

2929

30-
31-
3230
name: 'Build xPack WineHQ linux-x64'
3331

3432
on:
@@ -68,14 +66,10 @@ on:
6866
default: 'xpack-development'
6967

7068
jobs:
71-
72-
7369
linux-x64-build:
7470
name: 'linux-x64 wine ${{github.event.inputs.version}} build'
75-
timeout-minutes: 5760 # 4 days
71+
timeout-minutes: 2880 # 2 days
7672
runs-on: [self-hosted, linux, x64, xbblix]
77-
container:
78-
image: ilegeul/debian:amd64-10-xbb-v6.0.0
7973
defaults:
8074
run:
8175
shell: bash
@@ -108,40 +102,20 @@ jobs:
108102
npm install --location=global xpm@${{github.event.inputs.xpm_version}}
109103
xpm --version
110104
111-
- name: 'Install project dependencies'
112-
timeout-minutes: 1440
113-
run: xpm install --loglevel ${{github.event.inputs.xpm_install_loglevel}} ${{github.event.inputs.xpm_install_options}} -C build-assets
114-
115105
- name: 'Build linux-x64 binaries'
116106
timeout-minutes: 1440
117107
run: |
118-
xpm install --config linux-x64 --loglevel ${{github.event.inputs.xpm_install_loglevel}} ${{github.event.inputs.xpm_install_options}} -C build-assets
119-
xpm run build --config linux-x64 -C build-assets
120-
121-
linux-x64-upload:
122-
name: 'linux-x64 wine ${{github.event.inputs.version}} upload'
123-
timeout-minutes: 5760 # 4 days
124-
runs-on: [self-hosted, linux, x64, xbblix]
125-
defaults:
126-
run:
127-
shell: bash
128-
needs: [linux-x64-build]
129-
130-
steps:
131-
- name: 'Show environment'
132-
run: |
133-
uname -a
134-
lsb_release -sd
135-
echo "whoami: $(whoami)"
136-
echo "pwd: $(pwd)"
137-
ls -lLA
138-
env | sort | grep -E '^[^ \t]+='
108+
xpm install --loglevel ${{github.event.inputs.xpm_install_loglevel}} ${{github.event.inputs.xpm_install_options}} -C build-assets
109+
xpm run docker-prepare --config linux-x64 --loglevel ${{github.event.inputs.xpm_install_loglevel}} ${{github.event.inputs.xpm_install_options}} -C build-assets
110+
xpm run docker-build --config linux-x64 -C build-assets
111+
ls -l build-assets/build/linux-x64/application
112+
ls -l build-assets/build/linux-x64/deploy
139113
140114
- name: Upload platform artefacts
141115
uses: actions/upload-artifact@v4
142116
with:
143117
name: deploy-linux-x64
144-
path: ${{github.workspace}}/build/linux-x64/deploy/*
118+
path: ${{github.workspace}}/build-assets/build/linux-x64/deploy/*
145119
overwrite: true
146120

147121
- name: 'Publish pre-release'
@@ -171,7 +145,7 @@ jobs:
171145
linux-x64-test:
172146
name: 'linux-x64 wine ${{github.event.inputs.version}} test'
173147
runs-on: ubuntu-24.04
174-
needs: [linux-x64-upload]
148+
needs: [linux-x64-build]
175149

176150
steps:
177151
- name: 'Show environment'
@@ -183,6 +157,7 @@ jobs:
183157
ls -lLA
184158
env | sort | grep -E '^[^ \t]+='
185159
160+
# https://github.com/actions/checkout
186161
- name: 'Checkout project'
187162
uses: actions/checkout@v4
188163
with:
@@ -198,6 +173,3 @@ jobs:
198173

199174
- name: 'Run ${{github.event.inputs.version}} native test'
200175
run: bash build-assets/scripts/test.sh --image github-actions-ubuntu-latest --version ${{github.event.inputs.version}} --base-url pre-release
201-
202-
203-

.github/workflows/publish-github-pages.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@
1313
#
1414
# -----------------------------------------------------------------------------
1515

16-
# Simple workflow for deploying static content to GitHub Pages
16+
# https://xpack-dev-tools.github.io/wine-xpack/
17+
# https://github.com/xpack-dev-tools/wine-xpack/actions/workflows/publish-github-pages.yml
18+
19+
# Workflow for deploying static content to GitHub Pages.
1720
name: GitHub Pages
1821

22+
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
1923
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows
24+
2025
on:
2126
# Runs on pushes, if all conditions are met:
2227
push:
@@ -37,27 +42,29 @@ on:
3742
- 'package.json'
3843
- 'build-assets/package.json'
3944

40-
# Allows you to run this workflow manually from the Actions tab
45+
# Allows you to run this workflow manually from the Actions tab.
4146
workflow_dispatch:
4247

43-
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
48+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages.
4449
permissions:
4550
contents: read
4651
pages: write
4752
id-token: write
4853

49-
# Allow one concurrent deployment
54+
# Allow one concurrent deployment.
55+
# https://docs.github.com/en/actions/using-jobs/using-concurrency
5056
concurrency:
5157
group: "pages"
5258
cancel-in-progress: true
5359

5460
jobs:
55-
# Single deploy job since we're just deploying
61+
# Single deploy job since we're just deploying.
5662
# https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
5763
deploy:
5864
environment:
5965
name: github-pages
6066
url: ${{steps.deployment.outputs.page_url}}
67+
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
6168
runs-on: ubuntu-24.04
6269

6370
steps:
@@ -72,26 +79,29 @@ jobs:
7279
# https://github.com/actions/setup-node
7380
uses: actions/setup-node@v4
7481
with:
82+
# Node LTS version.
7583
node-version: 20
7684

7785
- name: Install dependencies
78-
run: npm ci -C website
86+
run: (cd website; npm ci)
7987

8088
- name: Build the Docusaurus site
81-
run: npm run build -C website
89+
run: (cd website; npm run build)
8290

8391
- name: Setup Pages
8492
# https://github.com/actions/configure-pages
8593
uses: actions/configure-pages@v5
8694

87-
- name: Upload artifact
95+
- name: Upload Pages artifact
8896
# https://github.com/actions/upload-pages-artifact
8997
uses: actions/upload-pages-artifact@v3
9098
with:
9199
# Upload entire repository
92100
path: './website/build'
93101

94102
- name: Deploy to GitHub Pages
95-
id: deployment
103+
id: deployment # referred by environment above, to get the URL.
96104
# https://github.com/actions/deploy-pages
97105
uses: actions/deploy-pages@v4
106+
with:
107+
artifact_name: github-pages

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,10 @@ build*/
154154
Thumbs.db
155155
.DS_Store
156156

157+
tests/top
158+
157159
website/.docusaurus
158160
website/build
161+
website/html
159162

160163
# ----- end -----

build-assets/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"xpack": {
1111
"minimumXpmRequired": "0.20.5",
1212
"devDependencies": {
13-
"@xpack-dev-tools/xbb-helper": "^3.1.8"
13+
"@xpack-dev-tools/xbb-helper": "^3.1.13"
1414
},
1515
"properties": {
1616
"platforms": "linux-x64",
1717
"buildFolderRelativePath": "{{'build' | path_join: configuration.name | to_filename | downcase}}",
1818
"buildFolderRelativePathPosix": "{{'build' | path_posix_join: configuration.name | downcase}}",
1919
"commandBashBuild": "bash {{properties.dbg}} scripts/build.sh --target {{configuration.name}} --build-folder {{properties.buildFolderRelativePathPosix}}",
20-
"xpm-version": "0.18.0",
20+
"xpm-version": "0.20.5",
2121
"xpm-install-loglevel": "info",
2222
"dbg": ""
2323
},

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@
8181
"liquidjs": "^10.19.1"
8282
},
8383
"topConfig": {
84-
"longName": "WineHQ",
85-
"shortName": "wine"
84+
"descriptiveName": "WineHQ",
85+
"permalinkName": "wine",
86+
"useSelfHostedRunners": "true"
8687
},
8788
"engines": {
8889
"node": " >=18.0.0"

0 commit comments

Comments
 (0)