Skip to content

Commit

Permalink
npmify and update to @lando/[email protected]
Browse files Browse the repository at this point in the history
  • Loading branch information
pirog committed Dec 5, 2023
1 parent d49d912 commit dbe4099
Show file tree
Hide file tree
Showing 14 changed files with 37,535 additions and 9,255 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dev-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile --production
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile --production
- name: Prepare Release
uses: lando/prepare-release-action@v2
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr-docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile

# Run tests
- name: Run linter
run: |
yarn docs:lint
npm run docs:lint
- name: Test build
run: |
yarn docs:build
npm run docs:build
8 changes: 4 additions & 4 deletions .github/workflows/pr-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile

# Run the linter
- name: Run code linter
run: yarn lint
run: npm run lint
6 changes: 3 additions & 3 deletions .github/workflows/pr-release-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile --production
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile --production
- name: Prepare Release
uses: lando/prepare-release-action@v2
with:
Expand Down
26 changes: 11 additions & 15 deletions .github/workflows/pr-runtime-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,14 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile --production

# @TODO: once we are no longer using github:lando/core-next#main as the repo for @lando/core-next
# eg once we are pulling a package from npm we can remove this
- name: Update to latest core-next
run: |
yarn upgrade @lando/core-next
git diff
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile --production

# package cli so we can use that in setup lando
# @TODO: remove skip-common-plugins when fatcore stuff is done
- name: Package CLI
run: yarn cli:build
run: npm run cli:build
- name: Setup locally built lando
uses: lando/setup-lando@v2
with:
Expand All @@ -64,7 +57,10 @@ jobs:
LANDO_CORE_RUNTIME=v4 lando version --all --debug
LANDO_CORE_RUNTIME=v4 lando config --debug
# This block should eventually become use lando/actions-leia@v2
- name: Run leia tests
shell: bash
run: yarn leia "./${{ matrix.leia-test }}/README.md" -c 'Destroy tests' --stdin --shell bash
- name: Run Leia Tests
uses: lando/run-leia-action@v2
with:
leia-test: "./${{ matrix.leia-test }}/README.md"
cleanup-header: "Destroy tests"
shell: bash
stdin: true
8 changes: 4 additions & 4 deletions .github/workflows/pr-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile

# Run unit tests
- name: Run unit tests
run: yarn test:unit
run: npm run test:unit
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile --production
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile --production
- name: Prepare Release
uses: lando/prepare-release-action@v2
with:
Expand Down Expand Up @@ -177,9 +177,9 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile --production
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile --production
- name: Prepare Release
uses: lando/prepare-release-action@v2
- name: Ensure version
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ _site
docs/.vuepress/.cache
docs/.vuepress/.temp
docs/.vuepress/dist

# Yarn
yarn.lock
4 changes: 2 additions & 2 deletions .lando.yml.no
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
cli:
type: node:14
build:
- yarn install
- npm install
scanner: false
ssl: false
sslExpose: false
Expand All @@ -17,5 +17,5 @@ tooling:
service: cli
vuepress:
service: cli
yarn:
npm:
service: cli
2 changes: 1 addition & 1 deletion docs/init.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ lando init --recipe pantheon
lando init --source cwd \
--recipe mean \
--option port=3000 \
--option command="yarn watch" \
--option command="npm run watch" \
--name meanest-app-youve-ever-seen

# Pull the latest Drupal 7 and set up drupal7 config to use mariadb instead of mysql
Expand Down
6 changes: 3 additions & 3 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build]
base = "./"
publish = "docs/.vuepress/dist"
command = "yarn docs:build"
command = "npm run docs:build"

# Sets our asset optimization
[build.processing.css]
Expand All @@ -20,7 +20,7 @@
for = "/images/*"
[headers.values]
Cache-Control = "public, max-age=31536000"

# We need this so preview environments and the base site look ok on their own
[[redirects]]
from = "/"
Expand All @@ -29,4 +29,4 @@
[[redirects]]
from = "/cli/*"
to = "/:splat"
status = 200
status = 200
Loading

0 comments on commit dbe4099

Please sign in to comment.