Skip to content

Commit f372516

Browse files
florianPatflorianPat
committed
chore: flos core package changes and make release possible
1 parent bf97bcc commit f372516

File tree

7 files changed

+178
-238
lines changed

7 files changed

+178
-238
lines changed

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

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,24 @@ jobs:
3232
run: npm run lint
3333
- name: Run unit tests
3434
run: npm run test:unit
35-
- name: Update edge release alias
36-
shell: bash
37-
run: |
38-
if ./scripts/semcompare.sh "${{ github.event.release.tag_name }}" "$(cat ./release-aliases/3-EDGE)"; then
39-
echo "${{ github.event.release.tag_name }}" > ./release-aliases/3-EDGE
40-
fi
41-
- name: Update stable release alias
42-
shell: bash
43-
if: github.event.release.prerelease == false
44-
run: |
45-
if ./scripts/semcompare.sh "${{ github.event.release.tag_name }}" "$(cat ./release-aliases/3-STABLE)"; then
46-
echo "${{ github.event.release.tag_name }}" > ./release-aliases/3-STABLE
47-
fi
35+
#- name: Update edge release alias
36+
# shell: bash
37+
# run: |
38+
# if ./scripts/semcompare.sh "${{ github.event.release.tag_name }}" "$(cat ./release-aliases/3-EDGE)"; then
39+
# echo "${{ github.event.release.tag_name }}" > ./release-aliases/3-EDGE
40+
# fi
41+
#- name: Update stable release alias
42+
# shell: bash
43+
# if: github.event.release.prerelease == false
44+
# run: |
45+
# if ./scripts/semcompare.sh "${{ github.event.release.tag_name }}" "$(cat ./release-aliases/3-STABLE)"; then
46+
# echo "${{ github.event.release.tag_name }}" > ./release-aliases/3-STABLE
47+
# fi
4848
- name: Prepare Release
4949
uses: lando/prepare-release-action@v3
5050
with:
5151
lando-plugin: true
52-
sync-token: ${{ secrets.github-token }}
53-
sync-email: rtfm47@lando.dev
54-
sync-username: rtfm-47
52+
sync: false
5553
- name: Upgrade npm for trusted publishing
5654
run: npm install -g "npm@^11.5.1"
5755
- name: Publish to npm
@@ -62,7 +60,7 @@ jobs:
6260
if [ "${{ github.event.release.prerelease }}" == "false" ]; then
6361
npm publish --access public --tag latest --dry-run
6462
npm publish --access public --tag latest
65-
npm dist-tag add "$PACKAGE@$VERSION" edge
63+
# npm dist-tag add "$PACKAGE@$VERSION" edge # not supported with trusted publishing
6664
6765
echo "::notice title=Published $VERSION to $PACKAGE::This is a stable release published to the default 'latest' npm tag"
6866
echo "::notice title=Updated latest tag to $VERSION::The stable tag now points to $VERSION"
@@ -74,14 +72,14 @@ jobs:
7472
echo "::notice title=Published $VERSION to $PACKAGE::This is a prerelease published to the 'edge' npm tag"
7573
echo "::notice title=Updated edge tag to $VERSION::The edge tag now points to $VERSION"
7674
fi
77-
- name: Update edge release alias on main
78-
if: github.event.release.target_commitish == 'edge'
79-
run: |
80-
git clone https://github.com/lando/core.git core
81-
cd core
82-
git config user.name "rtfm-47"
83-
git config user.email "rtfm47@lando.dev"
84-
echo "${{ github.event.release.tag_name }}" > ./release-aliases/3-EDGE
85-
git add .
86-
git commit -m "Update edge release alias to ${{ github.event.release.tag_name }} triggered by @rtfm-47"
87-
git push https://x-access-token:${{ secrets.github-token }}@github.com/lando/core.git main
75+
#- name: Update edge release alias on main
76+
# if: github.event.release.target_commitish == 'edge'
77+
# run: |
78+
# git clone https://github.com/lando/core.git core
79+
# cd core
80+
# git config user.name "rtfm-47"
81+
# git config user.email "rtfm47@lando.dev"
82+
# echo "${{ github.event.release.tag_name }}" > ./release-aliases/3-EDGE
83+
# git add .
84+
# git commit -m "Update edge release alias to ${{ github.event.release.tag_name }} triggered by @rtfm-47"
85+
# git push https://x-access-token:${{ secrets.github-token }}@github.com/lando/core.git main

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

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,38 @@ jobs:
2929
os: ${{ matrix.os }}
3030
version: dev
3131

32-
sign:
33-
uses: ./.github/workflows/sign-binary.yml
34-
needs:
35-
- package
36-
strategy:
37-
fail-fast: false
38-
matrix:
39-
file:
40-
- lando-linux-arm64-${{ github.sha }}
41-
- lando-macos-arm64-${{ github.sha }}
42-
- lando-win-arm64-${{ github.sha }}
32+
#sign:
33+
# uses: ./.github/workflows/sign-binary.yml
34+
# needs:
35+
# - package
36+
# strategy:
37+
# fail-fast: false
38+
# matrix:
39+
# file:
40+
# - lando-linux-arm64-${{ github.sha }}
41+
# - lando-macos-arm64-${{ github.sha }}
42+
# - lando-win-arm64-${{ github.sha }}
4343

44-
- lando-linux-x64-${{ github.sha }}
45-
- lando-macos-x64-${{ github.sha }}
46-
- lando-win-x64-${{ github.sha }}
44+
# - lando-linux-x64-${{ github.sha }}
45+
# - lando-macos-x64-${{ github.sha }}
46+
# - lando-win-x64-${{ github.sha }}
4747

48-
with:
49-
download-pattern: packaged-lando-*
50-
file: ${{ matrix.file }}
51-
secrets:
52-
apple-notary-user: ${{ secrets.APPLE_NOTARY_USER }}
53-
apple-notary-password: ${{ secrets.APPLE_NOTARY_PASSWORD }}
54-
certificate-data: ${{ contains(matrix.file, 'macos') && secrets.APPLE_CERT_DATA || secrets.KEYLOCKER_CLIENT_CERT }}
55-
certificate-password: ${{ contains(matrix.file, 'macos') && secrets.APPLE_CERT_PASSWORD || secrets.KEYLOCKER_CLIENT_CERT_PASSWORD }}
56-
keylocker-api-key: ${{ secrets.KEYLOCKER_API_KEY }}
57-
keylocker-cert-sha1-hash: ${{ secrets.KEYLOCKER_CERT_SHA1_HASH }}
58-
keylocker-keypair-alias: ${{ secrets.KEYLOCKER_KEYPAIR_ALIAS }}
48+
# with:
49+
# download-pattern: packaged-lando-*
50+
# file: ${{ matrix.file }}
51+
# secrets:
52+
# apple-notary-user: ${{ secrets.APPLE_NOTARY_USER }}
53+
# apple-notary-password: ${{ secrets.APPLE_NOTARY_PASSWORD }}
54+
# certificate-data: ${{ contains(matrix.file, 'macos') && secrets.APPLE_CERT_DATA || secrets.KEYLOCKER_CLIENT_CERT }}
55+
# certificate-password: ${{ contains(matrix.file, 'macos') && secrets.APPLE_CERT_PASSWORD || secrets.KEYLOCKER_CLIENT_CERT_PASSWORD }}
56+
# keylocker-api-key: ${{ secrets.KEYLOCKER_API_KEY }}
57+
# keylocker-cert-sha1-hash: ${{ secrets.KEYLOCKER_CERT_SHA1_HASH }}
58+
# keylocker-keypair-alias: ${{ secrets.KEYLOCKER_KEYPAIR_ALIAS }}
5959

6060
build-release-binary-alias:
6161
uses: ./.github/workflows/release-rename-binary.yml
6262
needs:
63-
- sign
63+
- package
6464
strategy:
6565
fail-fast: false
6666
matrix:
@@ -77,11 +77,11 @@ jobs:
7777
with:
7878
source: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
7979
destination: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.alias }}
80-
download-pattern: signed-lando-*
80+
download-pattern: packaged-lando-*
8181
build-release-binary-branch:
8282
uses: ./.github/workflows/release-rename-binary.yml
8383
needs:
84-
- sign
84+
- package
8585
strategy:
8686
fail-fast: false
8787
matrix:
@@ -96,7 +96,7 @@ jobs:
9696
with:
9797
source: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
9898
destination: lando-${{ matrix.os }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}
99-
download-pattern: signed-lando-*
99+
download-pattern: packaged-lando-*
100100

101101
checksum:
102102
uses: ./.github/workflows/generate-checksums.yml
@@ -116,16 +116,16 @@ jobs:
116116
show: true
117117
upload-name: release-checksums-${{ matrix.alias }}
118118

119-
deploy-releases-s3:
120-
uses: ./.github/workflows/deploy-s3.yml
121-
needs:
122-
- checksum
123-
with:
124-
download-pattern: release-*
125-
secrets:
126-
aws-secret-access-key: ${{ secrets.S3_SECRET_ACCESS_KEY }}
127-
aws-access-key-id: ${{ secrets.S3_ACCESS_KEY_ID }}
128-
aws-region: us-east-1
119+
#deploy-releases-s3:
120+
# uses: ./.github/workflows/deploy-s3.yml
121+
# needs:
122+
# - checksum
123+
# with:
124+
# download-pattern: release-*
125+
# secrets:
126+
# aws-secret-access-key: ${{ secrets.S3_SECRET_ACCESS_KEY }}
127+
# aws-access-key-id: ${{ secrets.S3_ACCESS_KEY_ID }}
128+
# aws-region: us-east-1
129129
deploy-releases-artifacts:
130130
uses: ./.github/workflows/deploy-artifacts.yml
131131
needs:

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ jobs:
5151
cache: npm
5252
- name: Install dependencies
5353
run: npm clean-install --prefer-offline --frozen-lockfile --production
54-
- name: Install plugins
55-
run: scripts/install-plugins.sh --lando bin/lando ${{ inputs.edge == true && '--edge' || '' }}
54+
#- name: Install plugins
55+
# run: scripts/install-plugins.sh --lando bin/lando ${{ inputs.edge == true && '--edge' || '' }}
5656
- name: Switch to edge channel
5757
if: inputs.edge == true
5858
run: |
@@ -82,8 +82,8 @@ jobs:
8282
- name: Ensure channel
8383
if: (inputs.os == 'linux' && runner.os == 'Linux') || (inputs.os == 'macos' && runner.os == 'macOS')
8484
run: ./dist/${{ inputs.filename }} config --path channel | grep ${{ inputs.edge == true && 'edge' || 'stable' }}
85-
- name: Ensure plugin install
86-
if: ((inputs.os == 'linux' && runner.os == 'Linux') || (inputs.os == 'macos' && runner.os == 'macOS'))
87-
run: |
88-
./dist/${{ inputs.filename }} config --path fatcore | grep true
89-
./dist/${{ inputs.filename }} config | grep -q "/snapshot/core/plugins/wordpress"
85+
#- name: Ensure plugin install
86+
# if: ((inputs.os == 'linux' && runner.os == 'Linux') || (inputs.os == 'macos' && runner.os == 'macOS'))
87+
# run: |
88+
# ./dist/${{ inputs.filename }} config --path fatcore | grep true
89+
# ./dist/${{ inputs.filename }} config | grep -q "/snapshot/core/plugins/wordpress"

0 commit comments

Comments
 (0)