Skip to content

Commit db4eb52

Browse files
authoredApr 17, 2024··
Fix CI by removing Azure Artifacts Feeds (#4978)
Until it's figured out how we're supposed to use these on GitHub.
1 parent 3a24728 commit db4eb52

File tree

3 files changed

+12
-34
lines changed

3 files changed

+12
-34
lines changed
 

‎.github/workflows/ci-test.yml

+10-18
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ jobs:
2121
DOTNET_CLI_TELEMETRY_OPTOUT: true
2222
DOTNET_GENERATE_ASPNET_CERTIFICATE: false
2323
DISPLAY: ':99.0'
24-
defaults:
25-
run:
26-
working-directory: vscode-powershell
2724
steps:
2825
- name: Checkout PowerShellEditorServices
2926
uses: actions/checkout@v4
@@ -40,24 +37,20 @@ jobs:
4037
uses: actions/setup-dotnet@v4
4138
with:
4239
cache: true
43-
cache-dependency-path: 'PowerShellEditorServices/**/packages.lock.json'
40+
cache-dependency-path: PowerShellEditorServices/**/packages.lock.json
4441
global-json-file: PowerShellEditorServices/global.json
45-
source-url: https://pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/nuget/v3/index.json
46-
config-file: PowerShellEditorServices/NuGet.config
47-
env:
48-
NUGET_AUTH_TOKEN: ${{ secrets.AZURE_NUGET_TOKEN }}
49-
50-
- name: Install PSResources
51-
shell: pwsh
52-
run: ./tools/installPSResources.ps1
5342

54-
- name: Deploy generated NuGet configuration
43+
- name: Remove Azure Artifact Feed configurations
5544
shell: pwsh
56-
run: Copy-Item ../../nuget.config ../PowerShellEditorServices/NuGet.config
45+
run: |
46+
Remove-Item -Force .npmrc
47+
Remove-Item test/mocks/BinaryModule/NuGet.Config
48+
Remove-Item ../PowerShellEditorServices/NuGet.Config
49+
working-directory: vscode-powershell
5750

58-
- name: Deploy NPM configuration
51+
- name: Install PSResources
5952
shell: pwsh
60-
run: Copy-Item .github/workflows/npmrc .npmrc
53+
run: ./vscode-powershell/tools/installPSResources.ps1
6154

6255
- uses: actions/setup-node@v4
6356
with:
@@ -72,8 +65,7 @@ jobs:
7265
- name: Build, test and package
7366
shell: pwsh
7467
run: Invoke-Build -Configuration Release
75-
env:
76-
NPM_PASSWORD: ${{ secrets.AZURE_NPM_PASSWORD_BASE64 }}
68+
working-directory: vscode-powershell
7769

7870
- name: Upload build artifacts
7971
uses: actions/upload-artifact@v4

‎.github/workflows/npmrc

-13
This file was deleted.

‎test/features/DebugSession.test.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -486,9 +486,8 @@ describe("DebugSessionFeature E2E", function() {
486486
let binaryModulePath: Uri;
487487

488488
before(async function binarySetup() {
489-
if (process.env.TF_BUILD) {
490-
// The binary modules tests won't work in the release pipeline
491-
// due to dependency requirements.
489+
if (!extensions.getExtension("ms-dotnettools.csharp")) {
490+
// These tests require that extension to be installed in the test environment.
492491
this.skip();
493492
}
494493
binaryModulePath = Uri.joinPath(workspace.workspaceFolders![0].uri, "BinaryModule");

0 commit comments

Comments
 (0)
Please sign in to comment.