Skip to content

Commit

Permalink
small updates
Browse files Browse the repository at this point in the history
  • Loading branch information
arturcic committed Feb 29, 2024
1 parent 6698a76 commit aa5e049
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .azure/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
- pwsh: |
npm install
npm run format-check
npm run build:github
npm run build:azure
npm run build:agent:github
npm run build:agent:azure
displayName: 'Build code'
- pwsh: |
# set the inputs for the 'gitversion/setup' action
Expand Down
7 changes: 2 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
max_line_length = off

[*.yml]
indent_size = 2

[*.md]
[{*.yml,*.yaml,*.md}]
indent_size = 2
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
os: [ windows-latest, ubuntu-latest, macos-13, macos-14 ]
fail-fast: false
steps:
- uses: actions/checkout@v4
Expand All @@ -37,8 +37,8 @@ jobs:
- run: |
npm install
npm run format-check
npm run build:github
npm run build:azure
npm run build:agent:github
npm run build:agent:azure
name: Build code
- name: gitversion/setup
uses: ./gitversion/setup
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
git fetch --prune --unshallow
- run: |
npm install
npm run build:github
npm run build:azure
npm run build:agent:github
npm run build:agent:azure
# npm run compress:github
# npm run compress:azure
Expand Down
30 changes: 26 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,31 @@
node_modules/
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
#dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

.test/

.taskkey
*.js
!dist/**/*.js
*.vsix

.idea/
/dist/mock/
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
node_modules/
src/*/node_modules/
3 changes: 2 additions & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
"trailingComma": "none",
"bracketSpacing": true,
"arrowParens": "avoid",
"parser": "typescript"
"parser": "typescript",
"endOfLine": "lf"
}
3 changes: 3 additions & 0 deletions package-lock.json

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

12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@
"description": "Easy Semantic Versioning (https://semver.org) for projects using Git",
"repository": {
"type": "git",
"url": "https://github.com/GitTools/use-gitversion.git"
"url": "https://github.com/GitTools/actions.git"
},
"module": "ES2022",
"engines": {
"node": ">=20.0.0"
},
"main": "main.js",
"scripts": {
"format": "prettier --write src/**/*.ts",
"format-check": "prettier --check src/**/*.ts",
"build:mock": "webpack --config webpack.config.js --env agent=mock",
"build:azure": "webpack --config webpack.config.js --env agent=azure",
"build:github": "webpack --config webpack.config.js --env agent=github",
"build:agent:mock": "webpack --config webpack.config.js --env agent=mock",
"build:agent:azure": "webpack --config webpack.config.js --env agent=azure",
"build:agent:github": "webpack --config webpack.config.js --env agent=github",
"compress:mock": "npm run build:mock -- --env task=compress",
"compress:azure": "npm run build:azure -- --env task=compress",
"compress:github": "npm run build:github -- --env task=compress",
Expand Down
2 changes: 1 addition & 1 deletion src/agent/github/build-agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class BuildAgent implements IBuildAgent {

public async exec(exec: string, args: string[]): Promise<IExecResult> {
const dotnetPath = await io.which(exec, true)
let result = await exe.getExecOutput(`"${dotnetPath}"`, args);
let result = await exe.getExecOutput(`"${dotnetPath}"`, args)
return {
code: result.exitCode,
error: null,
Expand Down

0 comments on commit aa5e049

Please sign in to comment.