From 4a15b31edb7bda8938361cfe61ded2465178bec3 Mon Sep 17 00:00:00 2001 From: Jorgen Dahl Date: Thu, 27 Jun 2024 13:08:45 -0400 Subject: [PATCH] Simplify pipeline (#106) --- README.md | 3 +-- cicdscripts/DownloadCICDResources.ps1 | 34 --------------------------- pipeline.yml | 11 --------- 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 cicdscripts/DownloadCICDResources.ps1 diff --git a/README.md b/README.md index cf7b4a4..2c6409b 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,7 @@ This repo is the package manager client for the Dynamo Package Manager. Package - From command line: ```bat - nuget restore src\GregClient.sln - msbuild src\GregClient.sln + dotnet build --configuration Release src/GregClient.sln ``` #### How to increment the assembly version: diff --git a/cicdscripts/DownloadCICDResources.ps1 b/cicdscripts/DownloadCICDResources.ps1 deleted file mode 100644 index a8e4a20..0000000 --- a/cicdscripts/DownloadCICDResources.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -<# - Purpose: Pull of the source from git -#> -$ErrorActionPreference = "Stop" - -try { - - #Redirecting GIT output - $env:GIT_REDIRECT_STDERR = '2>&1' - - if ([string]::IsNullOrWhiteSpace($env:URL_REPO_TOOLS) -or [string]::IsNullOrWhiteSpace($env:BRANCH_TOOLS)) - { - throw "The tool repository parameters had not been set properly" - } - else - { - $JUser = "$env:GITADSK_USERNAME" - $JPassword = [System.Web.HttpUtility]::UrlEncode("$env:GITADSK_PASSWORD") - - $GitUrl = "https://" + "$JUser" + ":" + "$JPassword" + "@$env:URL_REPO_TOOLS" - - git clone -b $env:BRANCH_TOOLS "$GitUrl" "$env:WORKSPACE\$env:COMMON_TOOLS_DIR" - - if($LASTEXITCODE -ne 0) - { - throw "The download of the tools failed" - } - } - -} -catch { - Write-Host $error[0] - throw $LASTEXITCODE -} \ No newline at end of file diff --git a/pipeline.yml b/pipeline.yml index 39a0f09..6d0cc9f 100644 --- a/pipeline.yml +++ b/pipeline.yml @@ -4,16 +4,7 @@ env: - SLACK_QUANTUM_BUILD_CHANNEL : "#dynamo-jenkinsbuild" - SLACK_QUANTUM_BUILD_CREDENTIAL_ID : "slack-notify-token" - MAIL_QUANTUM_BUILD_RECIPIENT : "dynamo.dev@autodesk.com" - - NUGETTOOL : "Nuget\\nuget.exe" - - NUNITTOOL : "NUnit\\NUnit.ConsoleRunner\\tools\\nunit3-console.exe" - - URL_REPO_TOOLS : "git.autodesk.com/Dynamo/CICDResources.git" - - BRANCH_TOOLS : "master" - NUGET_PUBLISH_SOURCE: "https://api.nuget.org/v3/index.json" - - COMMON_TOOLS_DIR : "CICDResources_shared" - - DOTCOVERTOOL : "DotCover\\JetBrains.dotCover.CommandLineTools\\tools\\dotCover.exe" - - SONARSCANTOOL : "SonarScannerMsbuild\\dotnet-framework-sonarscanner\\tools\\SonarScanner.MSBuild.exe" - - NUGET_SOURCES : "nuget.org" - - NUGET_CONFIG : "Config\\nuget.config" check_changelog_updated_on_pr: false pipeline_os: "Windows" @@ -41,8 +32,6 @@ build: setup_proj_deps : true solution: src\\GregClient.sln scripts: - - "pwsh.exe -ExecutionPolicy ByPass -File .\\cicdscripts\\DownloadCICDResources.ps1" - - "pwsh.exe -ExecutionPolicy ByPass -File .\\%COMMON_TOOLS_DIR%\\scripts\\SetupHost.ps1" - "dotnet build --configuration Release src/GregClient.sln" ci_test: tests: