Skip to content

Commit 9e49981

Browse files
committed
Fixup names and spacing, and add dotnet env to Vim and Emacs tests
1 parent 11376c3 commit 9e49981

File tree

4 files changed

+31
-15
lines changed

4 files changed

+31
-15
lines changed

.github/workflows/ci-test.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ on:
1111
types: [ checks_requested ]
1212

1313
jobs:
14-
os_matrix:
14+
ci:
15+
name: dotnet
1516
strategy:
1617
matrix:
1718
os: [ windows-latest, macos-latest, ubuntu-latest ]
@@ -23,6 +24,7 @@ jobs:
2324
steps:
2425
- name: Checkout repository
2526
uses: actions/checkout@v4
27+
2628
- name: Install dotnet
2729
uses: actions/setup-dotnet@v4
2830
with:
@@ -31,18 +33,22 @@ jobs:
3133
dotnet-version: |
3234
6.0.x
3335
7.0.x
36+
3437
- name: Install PSResources
3538
shell: pwsh
3639
run: tools/installPSResources.ps1
40+
3741
- name: Build and test
3842
shell: pwsh
3943
run: Invoke-Build
44+
4045
- name: Upload build artifacts
4146
if: always()
4247
uses: actions/upload-artifact@v3
4348
with:
4449
name: PowerShellEditorServices-module-${{ matrix.os }}
4550
path: module
51+
4652
- name: Upload test results
4753
uses: actions/upload-artifact@v3
4854
if: always()

.github/workflows/codeql-analysis.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run CodeQL Analysis
1+
name: CodeQL Analysis
22

33
on:
44
push:
@@ -12,18 +12,20 @@ on:
1212

1313
jobs:
1414
analyze:
15-
name: Analyze
15+
name: analyze
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
language: [ csharp ]
1620
runs-on: ubuntu-latest
1721
permissions:
1822
actions: read
1923
contents: read
2024
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
2729
steps:
2830
- name: Checkout repository
2931
uses: actions/checkout@v4
@@ -34,7 +36,6 @@ jobs:
3436
cache: true
3537
cache-dependency-path: '**/packages.lock.json'
3638

37-
# Initializes the CodeQL tools for scanning.
3839
- name: Initialize CodeQL
3940
uses: github/codeql-action/init@v2
4041
with:
@@ -50,3 +51,5 @@ jobs:
5051

5152
- name: Perform CodeQL Analysis
5253
uses: github/codeql-action/analyze@v2
54+
with:
55+
category: '/language:${{matrix.language}}'

.github/workflows/emacs-test.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ on:
1111
types: [ checks_requested ]
1212

1313
jobs:
14-
test:
15-
name: Test via Eglot
14+
emacs:
15+
name: ert
1616
runs-on: ubuntu-latest
17+
env:
18+
DOTNET_NOLOGO: true
19+
DOTNET_CLI_TELEMETRY_OPTOUT: true
20+
DOTNET_GENERATE_ASPNET_CERTIFICATE: false
1721
steps:
1822
- name: Checkout repository
1923
uses: actions/checkout@v4

.github/workflows/vim-test.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ on:
1111
types: [ checks_requested ]
1212

1313
jobs:
14-
test:
15-
name: Test via LanguageClient-neovim
14+
vim:
15+
name: themis
1616
runs-on: ubuntu-latest
17+
env:
18+
DOTNET_NOLOGO: true
19+
DOTNET_CLI_TELEMETRY_OPTOUT: true
20+
DOTNET_GENERATE_ASPNET_CERTIFICATE: false
1721
steps:
1822
- name: Checkout repository
1923
uses: actions/checkout@v4
@@ -34,7 +38,6 @@ jobs:
3438

3539
- name: Install Vim
3640
uses: rhysd/action-setup-vim@v1
37-
id: vim
3841

3942
- name: Checkout vim-ps1
4043
uses: actions/checkout@v4

0 commit comments

Comments
 (0)