Skip to content

Commit

Permalink
chore: merge branch 'master' into feature/implement-conf
Browse files Browse the repository at this point in the history
  • Loading branch information
damienbutt committed Jul 27, 2024
2 parents e62900f + 860dc29 commit b42bf14
Show file tree
Hide file tree
Showing 6 changed files with 284 additions and 35 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
22 changes: 12 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,26 @@ jobs:
build:
name: Build, lint, and test on Node ${{ matrix.node-version }}

runs-on: windows-latest
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x, 20.x]
node-version: [18.x, 20.x, 22.x]

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false

- name: Setup PNPM
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 8
version: 9

- name: Setup Node ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: pnpm
Expand All @@ -46,17 +47,18 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false

- name: Setup PNPM
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 8
version: 9

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
cache: pnpm
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.15.1
20.16.0
4 changes: 2 additions & 2 deletions lib/utils/getAppConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ export async function getAppConfig(cliOptions: CliOptions): Promise<Config> {
};

return mergician({
appendArrays: true,
prependArrays: true,
dedupArrays: true,
sortArrays: true,
sortArrays: false,
})(config.default, config.global, config.local, config.cli);
}

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@
"cross-env": "^7.0.3",
"cz-conventional-changelog": "3.3.0",
"doctoc": "^2.2.1",
"husky": "^9.1.1",
"husky": "^9.1.3",
"jsdoc": "^4.0.3",
"lint-staged": "^15.2.7",
"nodemon": "^3.1.4",
"prettier": "^3.3.3",
"rimraf": "^6.0.1",
"semantic-release": "^24.0.0",
"terser": "^5.31.3",
"tsup": "^8.2.2",
"tsup": "^8.2.3",
"type-fest": "^4.23.0",
"typescript": "^5.5.4",
"vite-node": "^2.0.4"
Expand Down
Loading

0 comments on commit b42bf14

Please sign in to comment.