Skip to content

Commit 8e388e4

Browse files
pirogpirog
committed
Merge branch 'edge' of github.com:lando/core into edge
2 parents 1eb9cc7 + 1c54eb2 commit 8e388e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+380
-202
lines changed

‎.eslintignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ _site
55
coverage
66
!.vitepress
77
config.mjs.timestamp-*.mjs
8+
plugins/*
9+
!plugins/test

‎.github/workflows/deploy-npm.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,19 @@ jobs:
3636
run: npm run lint
3737
- name: Run unit tests
3838
run: npm run test:unit
39-
- name: Update release helpers
39+
- name: Update edge release alias
4040
shell: bash
41+
if: github.event.release.prerelease == true
4142
run: |
42-
if [[ ${{ github.event.release.tag_name }} == v3* ]]; then
43-
echo "${{ github.event.release.tag_name }}" > release-aliases/3-EDGE
44-
if [ "${{ github.event.release.prerelease }}" == "false" ]; then
45-
echo "${{ github.event.release.tag_name }}" > release-aliases/3-STABLE
46-
fi
43+
if ./scripts/semcompare.sh "${{ github.event.release.tag_name }}" "$(cat ./release-aliases/3-EDGE)"; then
44+
echo "${{ github.event.release.tag_name }}" > ./release-aliases/3-EDGE
45+
fi
46+
- name: Update stable release alias
47+
shell: bash
48+
if: github.event.release.prerelease == false
49+
run: |
50+
if ./scripts/semcompare.sh "${{ github.event.release.tag_name }}" "$(cat ./release-aliases/3-STABLE)"; then
51+
echo "${{ github.event.release.tag_name }}" > ./release-aliases/3-STABLE
4752
fi
4853
- name: Prepare Release
4954
uses: lando/prepare-release-action@v3

‎.github/workflows/dev-release.yml‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,11 @@ jobs:
2020
- linux
2121
- macos
2222
- win
23-
fatcore:
24-
- false
25-
- true
23+
2624
with:
2725
arch: ${{ matrix.arch }}
2826
edge: true
29-
fatcore: ${{ matrix.fatcore }}
30-
filename: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}${{ matrix.fatcore == false && '-slim' || '' }}
27+
filename: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
3128
node-version: "20"
3229
os: ${{ matrix.os }}
3330
version: dev
@@ -48,13 +45,6 @@ jobs:
4845
- lando-macos-x64-${{ github.sha }}
4946
- lando-win-x64-${{ github.sha }}
5047

51-
- lando-linux-arm64-${{ github.sha }}-slim
52-
- lando-macos-arm64-${{ github.sha }}-slim
53-
- lando-win-arm64-${{ github.sha }}-slim
54-
55-
- lando-linux-x64-${{ github.sha }}-slim
56-
- lando-macos-x64-${{ github.sha }}-slim
57-
- lando-win-x64-${{ github.sha }}-slim
5848
with:
5949
download-pattern: packaged-lando-*
6050
file: ${{ matrix.file }}
@@ -81,15 +71,12 @@ jobs:
8171
- linux
8272
- macos
8373
- win
84-
type:
85-
- -slim
86-
-
8774
alias:
8875
- dev
8976
- latest
9077
with:
91-
source: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}${{ matrix.type }}
92-
destination: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.alias }}${{ matrix.type }}
78+
source: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
79+
destination: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.alias }}
9380
download-pattern: signed-lando-*
9481
build-release-binary-branch:
9582
uses: ./.github/workflows/release-rename-binary.yml
@@ -105,12 +92,10 @@ jobs:
10592
- linux
10693
- macos
10794
- win
108-
type:
109-
- -slim
110-
-
95+
11196
with:
112-
source: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}${{ matrix.type }}
113-
destination: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}${{ matrix.type }}
97+
source: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
98+
destination: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}
11499
download-pattern: signed-lando-*
115100

116101
checksum:

‎.github/workflows/pkg-binary.yml‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ on:
1818
description: The name of the resulting binary
1919
required: false
2020
type: string
21-
fatcore:
22-
default: false
23-
description: Whether to build a fat binary or not
24-
required: false
25-
type: boolean
2621
node-version:
2722
default: "20"
2823
description: The node version to build for eg 16 | 18 | 20
@@ -56,9 +51,8 @@ jobs:
5651
cache: npm
5752
- name: Install dependencies
5853
run: npm clean-install --prefer-offline --frozen-lockfile --production
59-
- name: Install fatcore
60-
if: inputs.fatcore == true
61-
run: scripts/fatcore-install.sh ${{ inputs.edge == true && '--edge' || '' }}
54+
- name: Install plugins
55+
run: scripts/install-plugins.sh --lando bin/lando ${{ inputs.edge == true && '--edge' || '' }}
6256
- name: Switch to edge channel
6357
if: inputs.edge == true
6458
run: |
@@ -78,7 +72,7 @@ jobs:
7872
os: ${{ inputs.os }}
7973
options: --options dns-result-order=ipv4first
8074
pkg: "@yao-pkg/pkg@5.16.1"
81-
upload-key: "packaged-${{ inputs.filename }}-${{ inputs.os }}-${{ inputs.arch }}${{ inputs.fatcore == false && '-slim' || '' }}-${{ github.sha }}"
75+
upload-key: "packaged-${{ inputs.filename }}-${{ inputs.os }}-${{ inputs.arch }}-${{ github.sha }}"
8276
- name: Ensure version
8377
if: (inputs.os == 'linux' && runner.os == 'Linux') || (inputs.os == 'macos' && runner.os == 'macOS')
8478
run: ./dist/${{ inputs.filename }} version --all
@@ -88,11 +82,8 @@ jobs:
8882
- name: Ensure channel
8983
if: (inputs.os == 'linux' && runner.os == 'Linux') || (inputs.os == 'macos' && runner.os == 'macOS')
9084
run: ./dist/${{ inputs.filename }} config --path channel | grep ${{ inputs.edge == true && 'edge' || 'stable' }}
91-
- name: Ensure slimcore
92-
if: ((inputs.os == 'linux' && runner.os == 'Linux') || (inputs.os == 'macos' && runner.os == 'macOS')) && inputs.fatcore == false
93-
run: ./dist/${{ inputs.filename }} config --path fatcore | grep false
94-
- name: Ensure fatcore
95-
if: ((inputs.os == 'linux' && runner.os == 'Linux') || (inputs.os == 'macos' && runner.os == 'macOS')) && inputs.fatcore == true
85+
- name: Ensure plugin install
86+
if: ((inputs.os == 'linux' && runner.os == 'Linux') || (inputs.os == 'macos' && runner.os == 'macOS'))
9687
run: |
9788
./dist/${{ inputs.filename }} config --path fatcore | grep true
98-
./dist/${{ inputs.filename }} config | grep -q "node_modules/@lando/wordpress"
89+
./dist/${{ inputs.filename }} config | grep -q "/snapshot/core/plugins/wordpress"

‎.github/workflows/pr-core-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,11 @@ jobs:
9393
- name: Install pkg dependencies
9494
run: npm clean-install --prefer-offline --frozen-lockfile --production
9595
- name: Package into node binary
96-
uses: lando/pkg-action@v5
96+
uses: lando/pkg-action@v6
9797
id: pkg-action
9898
with:
9999
entrypoint: bin/lando
100+
filename: lando
100101
node-version: ${{ matrix.node-version }}
101102
options: --options dns-result-order=ipv4first
102103
upload: false

‎.github/workflows/pr-docs-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ jobs:
6666
- name: Install pkg dependencies
6767
run: npm clean-install --prefer-offline --frozen-lockfile --production
6868
- name: Package into node binary
69-
uses: lando/pkg-action@v5
69+
uses: lando/pkg-action@v6
7070
id: pkg-action
7171
with:
7272
entrypoint: bin/lando
73+
filename: lando
7374
node-version: ${{ matrix.node-version }}
7475
options: --options dns-result-order=ipv4first
7576
upload: false

‎.github/workflows/pr-release-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- win
1919
with:
2020
arch: ${{ matrix.arch }}
21-
filename: lando-${{ matrix.os }}-${{ matrix.arch }}-slim-${{ github.sha }}
21+
filename: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
2222
node-version: "20"
2323
os: ${{ matrix.os }}
2424
version: dev

‎.github/workflows/pr-setup-linux-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ jobs:
3636
- name: Install pkg dependencies
3737
run: npm clean-install --prefer-offline --frozen-lockfile --production
3838
- name: Package into node binary
39-
uses: lando/pkg-action@v5
39+
uses: lando/pkg-action@v6
4040
id: pkg-action
4141
with:
4242
entrypoint: bin/lando
43+
filename: lando
4344
node-version: ${{ matrix.node-version }}
4445
options: --options dns-result-order=ipv4first
4546
upload: false

‎.github/workflows/pr-setup-macos-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ jobs:
3737
- name: Install pkg dependencies
3838
run: npm clean-install --prefer-offline --frozen-lockfile --production
3939
- name: Package into node binary
40-
uses: lando/pkg-action@v5
40+
uses: lando/pkg-action@v6
4141
id: pkg-action
4242
with:
4343
entrypoint: bin/lando
44+
filename: lando
4445
node-version: ${{ matrix.node-version }}
4546
options: --options dns-result-order=ipv4first
4647
upload: false

‎.github/workflows/pr-setup-windows-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ jobs:
3535
- name: Install pkg dependencies
3636
run: npm clean-install --prefer-offline --frozen-lockfile --production
3737
- name: Package into node binary
38-
uses: lando/pkg-action@v5
38+
uses: lando/pkg-action@v6
3939
id: pkg-action
4040
with:
4141
entrypoint: bin/lando
42+
filename: lando
4243
node-version: ${{ matrix.node-version }}
4344
options: --options dns-result-order=ipv4first
4445
upload: false

0 commit comments

Comments
 (0)