Skip to content

Commit

Permalink
chore: run lint on ci yml files and update pnpm to v8 (#1155)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcdo29 authored Jul 23, 2024
2 parents 0f34d53 + 3c153f5 commit 8372761
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 93 deletions.
6 changes: 3 additions & 3 deletions .github/actions/lint-build-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ runs:
run: pnpm build
shell: bash
- name: Run Integration Tests
run: pnpm e2e -- --skip-nx-cache
run: pnpm e2e --skip-nx-cache
shell: bash
env:
NX_CLOUD_DISTRIBUTED_EXECUTION: false
- name: Stop Nx Cloud Agents
run: pnpx -y nx-cloud stop-all-agents
run: pnpx nx-cloud stop-all-agents
shell: bash
- name: Debug Coverage
run: cat coverage/lcov.info
Expand All @@ -24,4 +24,4 @@ runs:
uses: actions/upload-artifact@master
with:
name: coverage
path: coverage/lcov.info
path: coverage/lcov.info
8 changes: 4 additions & 4 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x

- name: Cache pnpm modules
uses: actions/cache@v4
Expand All @@ -18,7 +18,7 @@ runs:
${{ runner.os }}-
- name: Install pnpm
uses: pnpm/action-setup@v2.4.0
uses: pnpm/action-setup@v4
with:
version: 6
run_install: true
version: 8
run_install: true
44 changes: 22 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,39 +49,39 @@ jobs:
uses: ./.github/actions/lint-build-test
- name: Stop Nx Cloud Agents
run: pnpm nx-cloud stop-all-agents

analyze:
name: Analyze
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: javascript
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: javascript

- name: Autobuild
uses: github/codeql-action/autobuild@v2

- name: Autobuild
uses: github/codeql-action/autobuild@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2

auto-merge:
needs: pr
if: contains(github.event.pull_request.user.login, 'dependabot') || contains(github.event.pull_request.user.login, 'renovate')
runs-on: ubuntu-latest
steps:
- name: automerge
uses: pascalgn/automerge-action@v0.16.3
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABELS: ""
MERGE_METHOD: rebase
- name: automerge
uses: pascalgn/automerge-action@v0.16.3
env:
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
MERGE_LABELS: ''
MERGE_METHOD: rebase

send-coverage:
runs-on: ubuntu-latest
Expand All @@ -105,10 +105,10 @@ jobs:
name: Nx Agent
strategy:
matrix:
agent: [ 1, 2, 3 ]
agent: [1, 2, 3]
steps:
- uses: actions/checkout@v4
- name: Setup
uses: ./.github/actions/setup
- name: Start Nx Agent ${{ matrix.agent }}
run: pnpm nx-cloud start-agent
run: pnpm nx-cloud start-agent
2 changes: 1 addition & 1 deletion .github/workflows/docs-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18.x'
node-version: '20.x'
- name: Install pnpm
run: npm i -g pnpm
- name: Dependencies Install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- uses: actions/checkout@v4
- name: Setup
uses: ./.github/actions/setup

- name: Install Dependencies
run: pnpm i
- run: pnpm nx-cloud start-agent
- run: pnpm nx-cloud start-agent
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
"uvu": "0.5.6"
},
"resolutions": {
"terser": "^5.0.0"
"terser": "^5.0.0",
"reflect-metadata": "0.2.2"
}
}
69 changes: 9 additions & 60 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8372761

Please sign in to comment.