Commit 9e49981

committed

Fixup names and spacing, and add dotnet env to Vim and Emacs tests

1 parent 11376c3 commit 9e49981Copy full SHA for 9e49981

File tree

+31

-15

lines changed

+31

-15

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ on:`
`11`	`11`	`types: [ checks_requested ]`
`12`	`12`
`13`	`13`	`jobs:`
`14`		`- os_matrix:`
	`14`	`+ ci:`
	`15`	`+ name: dotnet`
`15`	`16`	`strategy:`
`16`	`17`	`matrix:`
`17`	`18`	`os: [ windows-latest, macos-latest, ubuntu-latest ]`
`@@ -23,6 +24,7 @@ jobs:`
`23`	`24`	`steps:`
`24`	`25`	`- name: Checkout repository`
`25`	`26`	`uses: actions/checkout@v4`
	`27`	`+`
`26`	`28`	`- name: Install dotnet`
`27`	`29`	`uses: actions/setup-dotnet@v4`
`28`	`30`	`with:`
`@@ -31,18 +33,22 @@ jobs:`
`31`	`33`	`dotnet-version: \|`
`32`	`34`	`6.0.x`
`33`	`35`	`7.0.x`
	`36`	`+`
`34`	`37`	`- name: Install PSResources`
`35`	`38`	`shell: pwsh`
`36`	`39`	`run: tools/installPSResources.ps1`
	`40`	`+`
`37`	`41`	`- name: Build and test`
`38`	`42`	`shell: pwsh`
`39`	`43`	`run: Invoke-Build`
	`44`	`+`
`40`	`45`	`- name: Upload build artifacts`
`41`	`46`	`if: always()`
`42`	`47`	`uses: actions/upload-artifact@v3`
`43`	`48`	`with:`
`44`	`49`	`name: PowerShellEditorServices-module-${{ matrix.os }}`
`45`	`50`	`path: module`
	`51`	`+`
`46`	`52`	`- name: Upload test results`
`47`	`53`	`uses: actions/upload-artifact@v3`
`48`	`54`	`if: always()`

Lines changed: 12 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Run CodeQL Analysis`
	`1`	`+name: CodeQL Analysis`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`
`@@ -12,18 +12,20 @@ on:`
`12`	`12`
`13`	`13`	`jobs:`
`14`	`14`	`analyze:`
`15`		`- name: Analyze`
	`15`	`+ name: analyze`
	`16`	`+ strategy:`
	`17`	`+ fail-fast: false`
	`18`	`+ matrix:`
	`19`	`+ language: [ csharp ]`
`16`	`20`	`runs-on: ubuntu-latest`
`17`	`21`	`permissions:`
`18`	`22`	`actions: read`
`19`	`23`	`contents: read`
`20`	`24`	`security-events: write`
`21`		`-`
`22`		`- strategy:`
`23`		`- fail-fast: false`
`24`		`- matrix:`
`25`		`- language: [ 'csharp' ]`
`26`		`-`
	`25`	`+ env:`
	`26`	`+ DOTNET_NOLOGO: true`
	`27`	`+ DOTNET_CLI_TELEMETRY_OPTOUT: true`
	`28`	`+ DOTNET_GENERATE_ASPNET_CERTIFICATE: false`
`27`	`29`	`steps:`
`28`	`30`	`- name: Checkout repository`
`29`	`31`	`uses: actions/checkout@v4`
`@@ -34,7 +36,6 @@ jobs:`
`34`	`36`	`cache: true`
`35`	`37`	`cache-dependency-path: '**/packages.lock.json'`
`36`	`38`
`37`		`- # Initializes the CodeQL tools for scanning.`
`38`	`39`	`- name: Initialize CodeQL`
`39`	`40`	`uses: github/codeql-action/init@v2`
`40`	`41`	`with:`
`@@ -50,3 +51,5 @@ jobs:`
`50`	`51`
`51`	`52`	`- name: Perform CodeQL Analysis`
`52`	`53`	`uses: github/codeql-action/analyze@v2`
	`54`	`+ with:`
	`55`	`+ category: '/language:${{matrix.language}}'`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,13 @@ on:`
`11`	`11`	`types: [ checks_requested ]`
`12`	`12`
`13`	`13`	`jobs:`
`14`		`- test:`
`15`		`- name: Test via Eglot`
	`14`	`+ emacs:`
	`15`	`+ name: ert`
`16`	`16`	`runs-on: ubuntu-latest`
	`17`	`+ env:`
	`18`	`+ DOTNET_NOLOGO: true`
	`19`	`+ DOTNET_CLI_TELEMETRY_OPTOUT: true`
	`20`	`+ DOTNET_GENERATE_ASPNET_CERTIFICATE: false`
`17`	`21`	`steps:`
`18`	`22`	`- name: Checkout repository`
`19`	`23`	`uses: actions/checkout@v4`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,13 @@ on:`
`11`	`11`	`types: [ checks_requested ]`
`12`	`12`
`13`	`13`	`jobs:`
`14`		`- test:`
`15`		`- name: Test via LanguageClient-neovim`
	`14`	`+ vim:`
	`15`	`+ name: themis`
`16`	`16`	`runs-on: ubuntu-latest`
	`17`	`+ env:`
	`18`	`+ DOTNET_NOLOGO: true`
	`19`	`+ DOTNET_CLI_TELEMETRY_OPTOUT: true`
	`20`	`+ DOTNET_GENERATE_ASPNET_CERTIFICATE: false`
`17`	`21`	`steps:`
`18`	`22`	`- name: Checkout repository`
`19`	`23`	`uses: actions/checkout@v4`
`@@ -34,7 +38,6 @@ jobs:`
`34`	`38`
`35`	`39`	`- name: Install Vim`
`36`	`40`	`uses: rhysd/action-setup-vim@v1`
`37`		`- id: vim`
`38`	`41`
`39`	`42`	`- name: Checkout vim-ps1`
`40`	`43`	`uses: actions/checkout@v4`

Comments

(0)