diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 966eb9f959..3116cc3a69 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -21,9 +21,6 @@ jobs: DOTNET_CLI_TELEMETRY_OPTOUT: true DOTNET_GENERATE_ASPNET_CERTIFICATE: false DISPLAY: ':99.0' - defaults: - run: - working-directory: vscode-powershell steps: - name: Checkout PowerShellEditorServices uses: actions/checkout@v4 @@ -40,24 +37,20 @@ jobs: uses: actions/setup-dotnet@v4 with: cache: true - cache-dependency-path: 'PowerShellEditorServices/**/packages.lock.json' + cache-dependency-path: PowerShellEditorServices/**/packages.lock.json global-json-file: PowerShellEditorServices/global.json - source-url: https://pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/nuget/v3/index.json - config-file: PowerShellEditorServices/NuGet.config - env: - NUGET_AUTH_TOKEN: ${{ secrets.AZURE_NUGET_TOKEN }} - - - name: Install PSResources - shell: pwsh - run: ./tools/installPSResources.ps1 - - name: Deploy generated NuGet configuration + - name: Remove Azure Artifact Feed configurations shell: pwsh - run: Copy-Item ../../nuget.config ../PowerShellEditorServices/NuGet.config + run: | + Remove-Item -Force .npmrc + Remove-Item test/mocks/BinaryModule/NuGet.Config + Remove-Item ../PowerShellEditorServices/NuGet.Config + working-directory: vscode-powershell - - name: Deploy NPM configuration + - name: Install PSResources shell: pwsh - run: Copy-Item .github/workflows/npmrc .npmrc + run: ./vscode-powershell/tools/installPSResources.ps1 - uses: actions/setup-node@v4 with: @@ -72,8 +65,7 @@ jobs: - name: Build, test and package shell: pwsh run: Invoke-Build -Configuration Release - env: - NPM_PASSWORD: ${{ secrets.AZURE_NPM_PASSWORD_BASE64 }} + working-directory: vscode-powershell - name: Upload build artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/npmrc b/.github/workflows/npmrc deleted file mode 100644 index 14809dbf33..0000000000 --- a/.github/workflows/npmrc +++ /dev/null @@ -1,13 +0,0 @@ -; This requires NPM_PASSWORD to be available as a base64 encoded secret, since -; Azure DevOps does not support actual auth tokens. - -; begin auth token -//pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/npm/registry/:username=powershell -//pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/npm/registry/:_password=${NPM_PASSWORD} -//pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/npm/registry/:email=powershell -//pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/npm/:username=powershell -//pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/npm/:_password=${NPM_PASSWORD} -//pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/npm/:email=powershell -; end auth token -registry=https://pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/npm/registry/ -always-auth=true diff --git a/test/features/DebugSession.test.ts b/test/features/DebugSession.test.ts index 934e42ed60..5a237fe881 100644 --- a/test/features/DebugSession.test.ts +++ b/test/features/DebugSession.test.ts @@ -486,9 +486,8 @@ describe("DebugSessionFeature E2E", function() { let binaryModulePath: Uri; before(async function binarySetup() { - if (process.env.TF_BUILD) { - // The binary modules tests won't work in the release pipeline - // due to dependency requirements. + if (!extensions.getExtension("ms-dotnettools.csharp")) { + // These tests require that extension to be installed in the test environment. this.skip(); } binaryModulePath = Uri.joinPath(workspace.workspaceFolders![0].uri, "BinaryModule");