Skip to content

Commit a3a230c

Browse files
ilg-ulilg-ul
committed
re-generate top commons
1 parent 6d397d8 commit a3a230c

20 files changed

+291
-243
lines changed

‎.github/copilot-instructions.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Copilot Instructions
2+
3+
## Project Overview
4+
5+
This is the xPack Meson Build project, part of the
6+
xPack Development Tools.
7+
8+
## Folder Structure
9+
10+
- `/build-assets`: Contains the build scripts, patches, etc
11+
- `/website`: Contains the Docusaurus web site
12+
13+
## Language and style
14+
15+
- Use British English spelling and grammar.
16+
- Use a professional tone.
17+
- Prefer folder to directory.

‎.github/workflows/build-darwin-arm64.yml‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# Automatically generated from npm-packages-helper/templates/*.
44
#
55
# This file is part of the xPack project (http://xpack.github.io).
6-
# Copyright (c) 2021 Liviu Ionescu. All rights reserved.
6+
# Copyright (c) 2021-2025 Liviu Ionescu. All rights reserved.
77
#
88
# Permission to use, copy, modify, and/or distribute this software
99
# for any purpose is hereby granted, under the terms of the MIT license.
1010
#
1111
# If a copy of the license was not distributed with this file, it can
12-
# be obtained from https://opensource.org/licenses/MIT.
12+
# be obtained from https://opensource.org/licenses/mit.
1313
#
1414
# -----------------------------------------------------------------------------
1515

@@ -69,7 +69,7 @@ jobs:
6969
darwin-arm64-build:
7070
name: 'darwin-arm64 meson-build ${{github.event.inputs.version}} build'
7171
timeout-minutes: 2880 # 2 days
72-
runs-on: [self-hosted, macos, apple]
72+
runs-on: macos-15
7373
env:
7474
XBB_ENVIRONMENT_MACOSX_DEPLOYMENT_TARGET: '11.0'
7575
steps:
@@ -85,11 +85,29 @@ jobs:
8585
ls -l /Library/Developer/CommandLineTools/usr/include || true
8686
echo "pwd: $(pwd)"
8787
echo "whoami: $(whoami)"
88-
echo "node: $(node --version)"
89-
echo "npm: $(npm --version)"
9088
ls -lLA
9189
env | sort | grep -E '^[^ \t]+='
9290
91+
- name: 'Remove Homebrew'
92+
uses: xpack/remove-homebrew-action@v1
93+
94+
- name: 'Setup Node.js'
95+
uses: actions/setup-node@v4
96+
with:
97+
node-version: '20'
98+
check-latest: true
99+
100+
- name: 'Install xpm'
101+
timeout-minutes: 1440
102+
run: |
103+
npm install --location=global xpm@${{github.event.inputs.xpm_version}}
104+
105+
- name: 'Verify Node.js, npm and xpm'
106+
run: |
107+
echo "$(which node): $(node --version)"
108+
echo "$(which npm): $(npm --version)"
109+
echo "$(which xpm): $(xpm --version)"
110+
93111
- name: 'Clean working area' # Mandatory for self-hosted runners.
94112
run: |
95113
chmod -Rf a+w * || true
@@ -100,12 +118,6 @@ jobs:
100118
with:
101119
fetch-depth: 3
102120

103-
- name: 'Install xpm'
104-
timeout-minutes: 1440
105-
run: |
106-
npm install --location=global xpm@${{github.event.inputs.xpm_version}}
107-
xpm --version
108-
109121
- name: 'Build darwin-arm64 binaries'
110122
timeout-minutes: 1440
111123
run: |
@@ -142,14 +154,10 @@ jobs:
142154
tag: 'test'
143155
token: ${{secrets.PUBLISH_TOKEN}}
144156

145-
- name: 'Rename working area'
146-
# For just in case absolute paths remain unprocessed.
147-
run: mv -v build-assets/build build-assets/build-$(date -u +%Y%m%d-%H%M%S)
148-
149157
darwin-arm64-test:
150158
name: 'darwin-arm64 meson-build ${{github.event.inputs.version}} test'
151-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
152-
runs-on: macos-14
159+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
160+
runs-on: macos-15
153161
needs: [darwin-arm64-build]
154162

155163
steps:
@@ -159,7 +167,6 @@ jobs:
159167
sw_vers
160168
ls -lA /Library/Developer/CommandLineTools/SDKs || true
161169
ls -lA /Applications
162-
sudo xcode-select --switch /Applications/Xcode_15.4.app
163170
xcode-select --print-path
164171
xcodebuild -version || true
165172
pkgutil --pkg-info=com.apple.pkg.CLTools_Executables || true
@@ -169,14 +176,17 @@ jobs:
169176
ls -lLA
170177
env | sort | grep -E '^[^ \t]+='
171178
179+
- name: 'Remove Homebrew'
180+
uses: xpack/remove-homebrew-action@v1
181+
172182
# https://github.com/actions/checkout
173183
- name: 'Checkout project'
174-
uses: actions/checkout@v4
184+
uses: actions/checkout@v5
175185
with:
176186
fetch-depth: 3
177187

178188
- name: 'Checkout helper ${{github.event.inputs.helper-git-ref}}'
179-
uses: actions/checkout@v4
189+
uses: actions/checkout@v5
180190
with:
181191
repository: xpack-dev-tools/xbb-helper-xpack
182192
path: build-assets/xpacks/@xpack-dev-tools/xbb-helper

‎.github/workflows/build-darwin-x64.yml‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# Automatically generated from npm-packages-helper/templates/*.
44
#
55
# This file is part of the xPack project (http://xpack.github.io).
6-
# Copyright (c) 2021 Liviu Ionescu. All rights reserved.
6+
# Copyright (c) 2021-2025 Liviu Ionescu. All rights reserved.
77
#
88
# Permission to use, copy, modify, and/or distribute this software
99
# for any purpose is hereby granted, under the terms of the MIT license.
1010
#
1111
# If a copy of the license was not distributed with this file, it can
12-
# be obtained from https://opensource.org/licenses/MIT.
12+
# be obtained from https://opensource.org/licenses/mit.
1313
#
1414
# -----------------------------------------------------------------------------
1515

@@ -69,7 +69,7 @@ jobs:
6969
darwin-x64-build:
7070
name: 'darwin-x64 meson-build ${{github.event.inputs.version}} build'
7171
timeout-minutes: 2880 # 2 days
72-
runs-on: [self-hosted, macos, intel]
72+
runs-on: macos-15-intel
7373
env:
7474
XBB_ENVIRONMENT_MACOSX_DEPLOYMENT_TARGET: '11.0'
7575
steps:
@@ -85,11 +85,29 @@ jobs:
8585
ls -l /Library/Developer/CommandLineTools/usr/include || true
8686
echo "pwd: $(pwd)"
8787
echo "whoami: $(whoami)"
88-
echo "node: $(node --version)"
89-
echo "npm: $(npm --version)"
9088
ls -lLA
9189
env | sort | grep -E '^[^ \t]+='
9290
91+
- name: 'Remove Homebrew'
92+
uses: xpack/remove-homebrew-action@v1
93+
94+
- name: 'Setup Node.js'
95+
uses: actions/setup-node@v4
96+
with:
97+
node-version: '20'
98+
check-latest: true
99+
100+
- name: 'Install xpm'
101+
timeout-minutes: 1440
102+
run: |
103+
npm install --location=global xpm@${{github.event.inputs.xpm_version}}
104+
105+
- name: 'Verify Node.js, npm and xpm'
106+
run: |
107+
echo "$(which node): $(node --version)"
108+
echo "$(which npm): $(npm --version)"
109+
echo "$(which xpm): $(xpm --version)"
110+
93111
- name: 'Clean working area' # Mandatory for self-hosted runners.
94112
run: |
95113
chmod -Rf a+w * || true
@@ -100,12 +118,6 @@ jobs:
100118
with:
101119
fetch-depth: 3
102120

103-
- name: 'Install xpm'
104-
timeout-minutes: 1440
105-
run: |
106-
npm install --location=global xpm@${{github.event.inputs.xpm_version}}
107-
xpm --version
108-
109121
- name: 'Build darwin-x64 binaries'
110122
timeout-minutes: 1440
111123
run: |
@@ -142,14 +154,10 @@ jobs:
142154
tag: 'test'
143155
token: ${{secrets.PUBLISH_TOKEN}}
144156

145-
- name: 'Rename working area'
146-
# For just in case absolute paths remain unprocessed.
147-
run: mv -v build-assets/build build-assets/build-$(date -u +%Y%m%d-%H%M%S)
148-
149157
darwin-x64-test:
150158
name: 'darwin-x64 meson-build ${{github.event.inputs.version}} test'
151-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
152-
runs-on: macos-13
159+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
160+
runs-on: macos-15-intel
153161
needs: [darwin-x64-build]
154162

155163
steps:
@@ -159,7 +167,6 @@ jobs:
159167
sw_vers
160168
ls -lA /Library/Developer/CommandLineTools/SDKs || true
161169
ls -lA /Applications
162-
sudo xcode-select --switch /Applications/Xcode_14.2.app
163170
xcode-select --print-path
164171
xcodebuild -version || true
165172
pkgutil --pkg-info=com.apple.pkg.CLTools_Executables || true
@@ -169,14 +176,17 @@ jobs:
169176
ls -lLA
170177
env | sort | grep -E '^[^ \t]+='
171178
179+
- name: 'Remove Homebrew'
180+
uses: xpack/remove-homebrew-action@v1
181+
172182
# https://github.com/actions/checkout
173183
- name: 'Checkout project'
174-
uses: actions/checkout@v4
184+
uses: actions/checkout@v5
175185
with:
176186
fetch-depth: 3
177187

178188
- name: 'Checkout helper ${{github.event.inputs.helper-git-ref}}'
179-
uses: actions/checkout@v4
189+
uses: actions/checkout@v5
180190
with:
181191
repository: xpack-dev-tools/xbb-helper-xpack
182192
path: build-assets/xpacks/@xpack-dev-tools/xbb-helper

‎.github/workflows/build-linux-arm64.yml‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# Automatically generated from npm-packages-helper/templates/*.
44
#
55
# This file is part of the xPack project (http://xpack.github.io).
6-
# Copyright (c) 2021 Liviu Ionescu. All rights reserved.
6+
# Copyright (c) 2021-2025 Liviu Ionescu. All rights reserved.
77
#
88
# Permission to use, copy, modify, and/or distribute this software
99
# for any purpose is hereby granted, under the terms of the MIT license.
1010
#
1111
# If a copy of the license was not distributed with this file, it can
12-
# be obtained from https://opensource.org/licenses/MIT.
12+
# be obtained from https://opensource.org/licenses/mit.
1313
#
1414
# -----------------------------------------------------------------------------
1515

@@ -69,7 +69,7 @@ jobs:
6969
linux-arm64-build:
7070
name: 'linux-arm64 meson-build ${{github.event.inputs.version}} build'
7171
timeout-minutes: 2880 # 2 days
72-
runs-on: [self-hosted, linux, arm64, xbbla, xbblax]
72+
runs-on: ubuntu-24.04-arm
7373
defaults:
7474
run:
7575
shell: bash
@@ -81,27 +81,25 @@ jobs:
8181
lsb_release -sd
8282
echo "whoami: $(whoami)"
8383
echo "pwd: $(pwd)"
84-
echo "node: $(node --version)"
85-
echo "npm: $(npm --version)"
8684
ls -lLA
8785
env | sort | grep -E '^[^ \t]+='
8886
89-
- name: 'Clean working area' # Mandatory for self-hosted runners.
87+
- name: 'Install xpm'
88+
timeout-minutes: 1440
89+
run: |
90+
npm install --location=global xpm@${{github.event.inputs.xpm_version}}
91+
92+
- name: 'Verify Node.js, npm and xpm'
9093
run: |
91-
chmod -Rf a+w * || true
92-
rm -rf * .git*
94+
echo "$(which node): $(node --version)"
95+
echo "$(which npm): $(npm --version)"
96+
echo "$(which xpm): $(xpm --version)"
9397
9498
- name: 'Checkout project'
9599
uses: actions/checkout@v1 # v1 for old Git
96100
with:
97101
fetch-depth: 3
98102

99-
- name: 'Install xpm'
100-
timeout-minutes: 1440
101-
run: |
102-
npm install --location=global xpm@${{github.event.inputs.xpm_version}}
103-
xpm --version
104-
105103
- name: 'Build linux-arm64 binaries'
106104
timeout-minutes: 1440
107105
run: |
@@ -138,10 +136,6 @@ jobs:
138136
tag: 'test'
139137
token: ${{secrets.PUBLISH_TOKEN}}
140138

141-
- name: 'Rename working area'
142-
# For just in case absolute paths remain unprocessed.
143-
run: echo mv -v build-assets/build build-assets/build-$(date -u +%Y%m%d-%H%M%S)
144-
145139
linux-arm64-test:
146140
name: 'linux-arm64 meson-build ${{github.event.inputs.version}} test'
147141
runs-on: ubuntu-24.04-arm
@@ -159,12 +153,12 @@ jobs:
159153
160154
# https://github.com/actions/checkout
161155
- name: 'Checkout project'
162-
uses: actions/checkout@v4
156+
uses: actions/checkout@v5
163157
with:
164158
fetch-depth: 3
165159

166160
- name: 'Checkout helper ${{github.event.inputs.helper-git-ref}}'
167-
uses: actions/checkout@v4
161+
uses: actions/checkout@v5
168162
with:
169163
repository: xpack-dev-tools/xbb-helper-xpack
170164
path: build-assets/xpacks/@xpack-dev-tools/xbb-helper

0 commit comments

Comments
 (0)