Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

Commit

Permalink
Upgraded dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeGinnivan committed Oct 29, 2022
1 parent e40dd10 commit 1eab18b
Show file tree
Hide file tree
Showing 17 changed files with 1,557 additions and 1,305 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"updateInternalDependencies": "patch",
"ignore": [],
"changelog": [
"@changesets/changelog-github",
"@svitejs/changesets-changelog-github-compact",
{
"repo": "arkahna/oss-nx-packages"
}
Expand Down
30 changes: 18 additions & 12 deletions .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,37 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 0

- name: Derive appropriate SHAs for base and head for `nx affected` commands
uses: nrwl/nx-set-shas@v2
uses: nrwl/nx-set-shas@v3

- name: Enable node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.x

- name: Cache pnpm modules
uses: actions/cache@v2
- uses: pnpm/[email protected]
with:
path: ~/.pnpm-store
key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-
version: 7
run_install: false

- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: pnpm/[email protected]
- uses: actions/cache@v3
name: Setup pnpm cache
with:
version: 7
run_install: true
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: TypeCheck
run: pnpm tsc -b
Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,34 @@ jobs:

steps:
- name: Checkout Repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0

- name: Setup Node.js 16.x
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.x

- uses: pnpm/action-setup@v2.1.0
- uses: pnpm/action-setup@v2.2.4
with:
version: 7
run_install: true
run_install: false

- name: Cache pnpm modules
uses: actions/cache@v2
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ~/.pnpm-store
key: \${{ runner.os }}-\${{ hashFiles('**/pnpm-lock.yaml') }}
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
\${{ runner.os }}-
${{ runner.os }}-pnpm-store-
- name: pnpm install
run: |
Expand Down
24 changes: 19 additions & 5 deletions .github/workflows/release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
steps:
- name: get pull request ref
id: get_pull_request_ref
uses: octokit/request-action@v2.1.0
uses: octokit/request-action@v2.x
with:
route: GET /repos/{owner}/{repository}/pulls/{issue_id}
owner: ${{ github.repository_owner }}
Expand All @@ -53,20 +53,34 @@ jobs:
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'

- name: pull the repo.
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
persist-credentials: true
repository: ${{ fromJson(steps.get_pull_request_ref.outputs.data).head.repo.full_name }}

- name: Setup Node.js 16.x
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.x

- uses: pnpm/action-setup@v2.1.0
- uses: pnpm/action-setup@v2.2.4
with:
version: 7
run_install: true
run_install: false

- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: pnpm install
run: |
Expand Down
6 changes: 3 additions & 3 deletions libs/nx-terraform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"url": "https://github.com/arkahna/oss-nx-packages.git"
},
"dependencies": {
"@arkahna/nx-workspace": "0.3.1",
"@arkahna/nx-workspace": "workspace:0.3.1",
"execa": "5.1.1",
"front-matter": "^4.0.2",
"node-fetch": "^2.6.7",
"public-ip": "^4.0.4",
"uuid-by-string": "^3.0.6"
"uuid-by-string": "^3.0.7"
},
"optionalDependencies": {
"@azure/arm-resources": "^5.0.0",
"@azure/arm-resources": "^5.0.1",
"@azure/identity": "^3.0.0",
"@azure/logger": "^1.0.3"
},
Expand Down
6 changes: 3 additions & 3 deletions libs/nx-terraform/src/executors/apply/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"cli": "nx",
"title": "Terraform Apply executor",
Expand Down Expand Up @@ -65,7 +67,5 @@
"description": "Leave firewall exceptions in place after apply"
}
},
"required": [
"environment"
]
"required": ["environment"]
}
7 changes: 3 additions & 4 deletions libs/nx-terraform/src/executors/destroy/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"cli": "nx",
"title": "Terraform Destroy executor",
Expand Down Expand Up @@ -60,9 +62,6 @@
"type": "boolean",
"description": "Run the Destroy action without user prompt for approval"
}

},
"required": [
"environment"
]
"required": ["environment"]
}
6 changes: 3 additions & 3 deletions libs/nx-terraform/src/executors/force-unlock/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"cli": "nx",
"title": "Terraform Force unlock executor",
Expand Down Expand Up @@ -30,7 +32,5 @@
"default": 5
}
},
"required": [
"environment"
]
"required": ["environment"]
}
2 changes: 2 additions & 0 deletions libs/nx-terraform/src/executors/lint/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"cli": "nx",
"title": "Terraform Lint executor",
Expand Down
6 changes: 3 additions & 3 deletions libs/nx-terraform/src/executors/output/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"cli": "nx",
"title": "Terraform output executor",
Expand Down Expand Up @@ -33,7 +35,5 @@
"default": 5
}
},
"required": [
"environment"
]
"required": ["environment"]
}
6 changes: 3 additions & 3 deletions libs/nx-terraform/src/executors/plan/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"cli": "nx",
"title": "Terraform Plan executor",
Expand Down Expand Up @@ -62,7 +64,5 @@
"description": "The target resource to deploy"
}
},
"required": [
"environment"
]
"required": ["environment"]
}
12 changes: 4 additions & 8 deletions libs/nx-terraform/src/executors/state/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"cli": "nx",
"title": "Terraform State executor",
Expand All @@ -13,10 +15,7 @@
"address": {
"type": "string",
"description": "The address of the resource",
"aliases": [
"r",
"p"
]
"aliases": ["r", "p"]
},
"environment": {
"type": "string",
Expand Down Expand Up @@ -44,8 +43,5 @@
"default": false
}
},
"required": [
"environment",
"command"
]
"required": ["environment", "command"]
}
2 changes: 2 additions & 0 deletions libs/nx-terraform/src/executors/tf-init/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"cli": "nx",
"title": "Terraform Init executor",
Expand Down
6 changes: 3 additions & 3 deletions libs/nx-workspace/src/executors/run-command/schema.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"version": 2,
"outputCapture": "direct-nodejs",
"$schema": "http://json-schema.org/schema",
"type": "object",
"cli": "nx",
Expand All @@ -12,7 +14,5 @@
"description": "The working directory to run the command in"
}
},
"required": [
"command"
]
"required": ["command"]
}
20 changes: 11 additions & 9 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,28 @@
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": [
"build",
"lint",
"test",
"e2e"
]
"cacheableOperations": ["build", "lint", "test", "e2e"]
}
}
},
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build": {
"dependsOn": [
"^build"
]
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
}
},
"pluginsConfig": {
"@nrwl/js": {
"analyzeSourceFiles": true
}
},
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": [],
"production": ["default", "!{projectRoot}/.eslintrc.json"]
}
}
Loading

0 comments on commit 1eab18b

Please sign in to comment.