Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pkg output #261

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions .github/workflows/dev-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,26 +57,26 @@ jobs:
entrypoint: bin/lando
node-version: ${{ matrix.node-version }}
os: ${{ matrix.os }}
options: --options dns-result-order=ipv4first
options: --options dns-result-order=ipv4first --output dist/@lando/lando
pkg: "@yao-pkg/[email protected]"
upload-key: "lando-${{ matrix.os }}-${{ matrix.runner == 'macos-14' && 'arm64' || 'x64' }}${{ matrix.type }}-${{ github.sha }}"
- name: Ensure version
if: (matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')
run: ./dist/@lando/core version --all
run: ./dist/@lando/lando version --all
- name: Ensure ipv4first
if: (matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')
run: ./dist/@lando/core config --path cli.args | grep dns-result-order=ipv4first
run: ./dist/@lando/lando config --path cli.args | grep dns-result-order=ipv4first
- name: Ensure edge channel
if: (matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')
run: ./dist/@lando/core config --path channel | grep edge
run: ./dist/@lando/lando config --path channel | grep edge
- name: Ensure slimcore
if: ((matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')) && matrix.type == '-slim'
run: ./dist/@lando/core config --path fatcore | grep false
run: ./dist/@lando/lando config --path fatcore | grep false
- name: Ensure fatcore
if: ((matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')) && matrix.type == ''
run: |
./dist/@lando/core config --path fatcore | grep true
./dist/@lando/core config | grep -q "node_modules/@lando/wordpress"
./dist/@lando/lando config --path fatcore | grep true
./dist/@lando/lando config | grep -q "node_modules/@lando/wordpress"

sign-n-deploy:
runs-on: ${{ matrix.os }}
Expand All @@ -90,32 +90,32 @@ jobs:
include:
- os: windows-2022
key: lando-win-x64-${{ github.sha }}
file: lando/core.exe
file: lando/lando.exe
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-win-x64-${{ github.ref_name }}.exe
- os: windows-2022
key: lando-win-arm64-${{ github.sha }}
file: lando/core.exe
file: lando/lando.exe
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-win-arm64-${{ github.ref_name }}.exe
- os: windows-2022
key: lando-win-x64-slim-${{ github.sha }}
file: lando/core.exe
file: lando/lando.exe
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-win-x64-${{ github.ref_name }}-slim.exe
- os: windows-2022
key: lando-win-arm64-slim-${{ github.sha }}
file: lando/core.exe
file: lando/lando.exe
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-win-arm64-${{ github.ref_name }}-slim.exe

- os: macos-14
key: lando-macos-x64-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: APPLE_CERT_DATA
certificate-password: APPLE_CERT_PASSWORD
apple-product-id: dev.lando.cli
Expand All @@ -126,7 +126,7 @@ jobs:
result: lando-macos-x64-${{ github.ref_name }}
- os: macos-14
key: lando-macos-arm64-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: APPLE_CERT_DATA
certificate-password: APPLE_CERT_PASSWORD
apple-product-id: dev.lando.cli
Expand All @@ -137,7 +137,7 @@ jobs:
result: lando-macos-arm64-${{ github.ref_name }}
- os: macos-14
key: lando-macos-x64-slim-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: APPLE_CERT_DATA
certificate-password: APPLE_CERT_PASSWORD
apple-product-id: dev.lando.cli
Expand All @@ -148,7 +148,7 @@ jobs:
result: lando-macos-x64-${{ github.ref_name }}-slim
- os: macos-14
key: lando-macos-arm64-slim-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: APPLE_CERT_DATA
certificate-password: APPLE_CERT_PASSWORD
apple-product-id: dev.lando.cli
Expand All @@ -160,25 +160,25 @@ jobs:

- os: ubuntu-24.04
key: lando-linux-x64-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-linux-x64-${{ github.ref_name }}
- os: ubuntu-24.04
key: lando-linux-arm64-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-linux-arm64-${{ github.ref_name }}
- os: ubuntu-24.04
key: lando-linux-x64-slim-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-linux-x64-${{ github.ref_name }}-slim
- os: ubuntu-24.04
key: lando-linux-arm64-slim-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-linux-arm64-${{ github.ref_name }}-slim
Expand Down Expand Up @@ -259,7 +259,7 @@ jobs:
find "artifacts" -mindepth 2 -maxdepth 2 -type f -exec mv {} "dist" \;
ls -lsa dist
- name: Checksum artifacts
run: ./scripts/generate-checksums.sh --directory dist --output checksums-dev-${{ github.sha }}.txt --show
run: ./scripts/generate-checksums.sh --directory dist --output sha256sum-dev-${{ github.sha }}.txt --show
- name: Configure S3 Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
Expand All @@ -269,6 +269,6 @@ jobs:
- name: Upload Checksums to S3
shell: bash
run: |
aws s3 cp checksums-dev-${{ github.sha }}.txt s3://files.lando.dev/
aws s3 cp checksums-dev-${{ github.sha }}.txt s3://files.lando.dev/cli/
aws s3 cp checksums-dev-${{ github.sha }}.txt s3://files.lando.dev/core/
aws s3 cp sha256sum-dev-${{ github.sha }}.txt s3://files.lando.dev/
aws s3 cp sha256sum-dev-${{ github.sha }}.txt s3://files.lando.dev/cli/
aws s3 cp sha256sum-dev-${{ github.sha }}.txt s3://files.lando.dev/core/
16 changes: 8 additions & 8 deletions .github/workflows/pr-release-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,26 @@ jobs:
entrypoint: bin/lando
node-version: ${{ matrix.node-version }}
os: ${{ matrix.os }}
options: --options dns-result-order=ipv4first
options: --options dns-result-order=ipv4first --output dist/@lando/lando
pkg: "@yao-pkg/[email protected]"
upload-key: "lando-${{ matrix.os }}-${{ matrix.runner == 'macos-14' && 'arm64' || 'x64' }}${{ matrix.type }}-${{ github.sha }}"
- name: Ensure version
if: (matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')
run: ./dist/@lando/core version --all
run: ./dist/@lando/lando version --all
- name: Ensure ipv4first
if: (matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')
run: ./dist/@lando/core config --path cli.args | grep dns-result-order=ipv4first
run: ./dist/@lando/lando config --path cli.args | grep dns-result-order=ipv4first
- name: Ensure stable channel
if: (matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')
run: ./dist/@lando/core config --path channel | grep stable
run: ./dist/@lando/lando config --path channel | grep stable
- name: Ensure slimcore
if: ((matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')) && matrix.type == '-slim'
run: ./dist/@lando/core config --path fatcore | grep false
run: ./dist/@lando/lando config --path fatcore | grep false
- name: Ensure fatcore
if: ((matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')) && matrix.type == ''
run: |
./dist/@lando/core config --path fatcore | grep true
./dist/@lando/core config | grep -q "node_modules/@lando/wordpress"
./dist/@lando/lando config --path fatcore | grep true
./dist/@lando/lando config | grep -q "node_modules/@lando/wordpress"

release:
runs-on: ${{ matrix.os }}
Expand All @@ -93,7 +93,7 @@ jobs:
- name: Verify artifacts
run: |
./scripts/generate-checksums.sh --directory dist --depth 2 --show
cat checksums.txt | grep "$(sha256sum dist/lando-linux-x64-slim-${{ github.sha }}/core)"
cat checksums.txt | grep "$(sha256sum dist/lando-linux-x64-slim-${{ github.sha }}/lando)"
- name: Install node ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,29 +61,29 @@ jobs:
entrypoint: bin/lando
node-version: ${{ matrix.node-version }}
os: ${{ matrix.os }}
options: --options dns-result-order=ipv4first
options: --options dns-result-order=ipv4first --output dist/@lando/lando
pkg: "@yao-pkg/[email protected]"
upload-key: "lando-${{ matrix.os }}-${{ matrix.runner == 'macos-14' && 'arm64' || 'x64' }}${{ matrix.type }}-${{ github.sha }}"
- name: Ensure version
if: (matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')
run: ./dist/@lando/core version --all
run: ./dist/@lando/lando version --all
- name: Ensure ipv4first
if: (matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')
run: ./dist/@lando/core config --path cli.args | grep dns-result-order=ipv4first
run: ./dist/@lando/lando config --path cli.args | grep dns-result-order=ipv4first
- name: Ensure edge channel
if: ((matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')) && github.event.release.prerelease == true
run: ./dist/@lando/core config --path channel | grep edge
run: ./dist/@lando/lando config --path channel | grep edge
- name: Ensure stable channel
if: ((matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')) && github.event.release.prerelease == false
run: ./dist/@lando/core config --path channel | grep stable
run: ./dist/@lando/lando config --path channel | grep stable
- name: Ensure slimcore
if: ((matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')) && matrix.type == '-slim'
run: ./dist/@lando/core config --path fatcore | grep false
run: ./dist/@lando/lando config --path fatcore | grep false
- name: Ensure fatcore
if: ((matrix.os == 'linux' && runner.os == 'Linux') || (matrix.os == 'macos' && runner.os == 'macOS')) && matrix.type == ''
run: |
./dist/@lando/core config --path fatcore | grep true
./dist/@lando/core config | grep -q "node_modules/@lando/wordpress"
./dist/@lando/lando config --path fatcore | grep true
./dist/@lando/lando config | grep -q "node_modules/@lando/wordpress"

sign-n-deploy:
runs-on: ${{ matrix.os }}
Expand All @@ -97,32 +97,32 @@ jobs:
include:
- os: windows-2022
key: lando-win-x64-${{ github.sha }}
file: lando/core.exe
file: lando/lando.exe
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-win-x64-${{ github.ref_name }}.exe
- os: windows-2022
key: lando-win-arm64-${{ github.sha }}
file: lando/core.exe
file: lando/lando.exe
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-win-arm64-${{ github.ref_name }}.exe
- os: windows-2022
key: lando-win-x64-slim-${{ github.sha }}
file: lando/core.exe
file: lando/lando.exe
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-win-x64-${{ github.ref_name }}-slim.exe
- os: windows-2022
key: lando-win-arm64-slim-${{ github.sha }}
file: lando/core.exe
file: lando/lando.exe
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-win-arm64-${{ github.ref_name }}-slim.exe

- os: macos-14
key: lando-macos-x64-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: APPLE_CERT_DATA
certificate-password: APPLE_CERT_PASSWORD
apple-product-id: dev.lando.cli
Expand All @@ -133,7 +133,7 @@ jobs:
result: lando-macos-x64-${{ github.ref_name }}
- os: macos-14
key: lando-macos-arm64-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: APPLE_CERT_DATA
certificate-password: APPLE_CERT_PASSWORD
apple-product-id: dev.lando.cli
Expand All @@ -144,7 +144,7 @@ jobs:
result: lando-macos-arm64-${{ github.ref_name }}
- os: macos-14
key: lando-macos-x64-slim-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: APPLE_CERT_DATA
certificate-password: APPLE_CERT_PASSWORD
apple-product-id: dev.lando.cli
Expand All @@ -155,7 +155,7 @@ jobs:
result: lando-macos-x64-${{ github.ref_name }}-slim
- os: macos-14
key: lando-macos-arm64-slim-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: APPLE_CERT_DATA
certificate-password: APPLE_CERT_PASSWORD
apple-product-id: dev.lando.cli
Expand All @@ -167,25 +167,25 @@ jobs:

- os: ubuntu-24.04
key: lando-linux-x64-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-linux-x64-${{ github.ref_name }}
- os: ubuntu-24.04
key: lando-linux-arm64-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-linux-arm64-${{ github.ref_name }}
- os: ubuntu-24.04
key: lando-linux-x64-slim-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-linux-x64-${{ github.ref_name }}-slim
- os: ubuntu-24.04
key: lando-linux-arm64-slim-${{ github.sha }}
file: lando/core
file: lando/lando
certificate-data: KEYLOCKER_CLIENT_CERT
certificate-password: KEYLOCKER_CLIENT_CERT_PASSWORD
result: lando-linux-arm64-${{ github.ref_name }}-slim
Expand Down Expand Up @@ -392,7 +392,7 @@ jobs:
find "artifacts" -mindepth 2 -maxdepth 2 -type f -exec mv {} "dist" \;
ls -lsa dist
- name: Checksum artifacts
run: ./scripts/generate-checksums.sh --directory dist --output checksums-${{ github.ref_name }}.txt --show
run: ./scripts/generate-checksums.sh --directory dist --output sha256sum-${{ github.ref_name }}.txt --show
- name: Configure S3 credentials
uses: aws-actions/configure-aws-credentials@v4
with:
Expand All @@ -402,13 +402,13 @@ jobs:
- name: Upload checksums to S3
shell: bash
run: |
aws s3 cp checksums-${{ github.ref_name }}.txt s3://files.lando.dev/
aws s3 cp checksums-${{ github.ref_name }}.txt s3://files.lando.dev/cli/
aws s3 cp checksums-${{ github.ref_name }}.txt s3://files.lando.dev/core/
aws s3 cp sha256sum-${{ github.ref_name }}.txt s3://files.lando.dev/
aws s3 cp sha256sum-${{ github.ref_name }}.txt s3://files.lando.dev/cli/
aws s3 cp sha256sum-${{ github.ref_name }}.txt s3://files.lando.dev/core/
- name: Upload checksums to GitHub Releases
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: checksums-${{ github.ref_name }}.txt
files: sha256sum-${{ github.ref_name }}.txt
fail_on_unmatched_files: true
Loading
Loading