From ae68cae9ef7213718b06b6c70b817b31403d5052 Mon Sep 17 00:00:00 2001 From: Anton Ivanov Date: Wed, 4 Sep 2024 11:44:04 +0300 Subject: [PATCH 1/6] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 042663c..ee3286b 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -17,6 +17,6 @@ jobs: - name: Build run: dotnet build -c Release sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj - name: Create NuGet Package - run: dotnet pack -c Release --no-build sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj -p:PackageVersion=${{ github.event.release.tag_name }} + run: dotnet pack -c Release --no-build sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj -p:PackageVersion=${{ github.event.release.tag_name#v }} - name: Push to NuGet run: dotnet nuget push **/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.LAMBDABUILDER }} From c462d89f7bfdcbd2e8a93df68b71a670052553fa Mon Sep 17 00:00:00 2001 From: Anton Ivanov Date: Wed, 4 Sep 2024 11:55:35 +0300 Subject: [PATCH 2/6] Update dotnet.yml --- .github/workflows/dotnet.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ee3286b..534f282 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -17,6 +17,10 @@ jobs: - name: Build run: dotnet build -c Release sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj - name: Create NuGet Package - run: dotnet pack -c Release --no-build sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj -p:PackageVersion=${{ github.event.release.tag_name#v }} + run: | + TAG=${{ github.event.release.tag_name }} + echo "VERSION=${TAG#v}" >> $GITHUB_ENV + echo Version: $VERSION + dotnet pack -c Release --no-build sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj -p:PackageVersion=$VERSION - name: Push to NuGet run: dotnet nuget push **/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.LAMBDABUILDER }} From e18917132081daa045b5a8ebc8f7db74eb904edd Mon Sep 17 00:00:00 2001 From: Anton Ivanov Date: Wed, 4 Sep 2024 12:10:51 +0300 Subject: [PATCH 3/6] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 534f282..931186b 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -16,6 +16,8 @@ jobs: run: dotnet restore sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj - name: Build run: dotnet build -c Release sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj + - name: Test + run: echo "VERSION=${{ github.event.release.tag_name }}" - name: Create NuGet Package run: | TAG=${{ github.event.release.tag_name }} From 989e7d217699c2fbb0fc5fc1f5d724c3c153d8aa Mon Sep 17 00:00:00 2001 From: Anton Ivanov Date: Wed, 4 Sep 2024 12:26:08 +0300 Subject: [PATCH 4/6] Update dotnet.yml --- .github/workflows/dotnet.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 931186b..46d6dca 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,6 +1,10 @@ name: Release to NuGet on: workflow_dispatch: + inputs: + packageVersion: + required: true + type: string jobs: publish: runs-on: ubuntu-latest @@ -17,12 +21,8 @@ jobs: - name: Build run: dotnet build -c Release sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj - name: Test - run: echo "VERSION=${{ github.event.release.tag_name }}" + run: echo "VERSION=${{ github.event.inputs.packageVersion }}" - name: Create NuGet Package - run: | - TAG=${{ github.event.release.tag_name }} - echo "VERSION=${TAG#v}" >> $GITHUB_ENV - echo Version: $VERSION - dotnet pack -c Release --no-build sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj -p:PackageVersion=$VERSION + run: dotnet pack -c Release --no-build sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj -p:PackageVersion=${{ github.event.inputs.packageVersion }} - name: Push to NuGet run: dotnet nuget push **/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.LAMBDABUILDER }} From 69ec337f3e7b85e9295815ae9aa434ff7aeebb0a Mon Sep 17 00:00:00 2001 From: Anton Ivanov Date: Wed, 4 Sep 2024 12:33:22 +0300 Subject: [PATCH 5/6] Update dotnet.yml --- .github/workflows/dotnet.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 46d6dca..5ad7596 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,10 +1,11 @@ name: Release to NuGet + on: workflow_dispatch: inputs: packageVersion: - required: true - type: string + required: true + type: string jobs: publish: runs-on: ubuntu-latest From 0bf9d8b5335566d35deb3e6c178fb51a5e8754cc Mon Sep 17 00:00:00 2001 From: Anton Ivanov Date: Wed, 4 Sep 2024 12:36:11 +0300 Subject: [PATCH 6/6] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 5ad7596..93ba2f9 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -21,8 +21,6 @@ jobs: run: dotnet restore sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj - name: Build run: dotnet build -c Release sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj - - name: Test - run: echo "VERSION=${{ github.event.inputs.packageVersion }}" - name: Create NuGet Package run: dotnet pack -c Release --no-build sources/Framework/org.ohdsi.cdm.framework/org.ohdsi.cdm.framework.csproj -p:PackageVersion=${{ github.event.inputs.packageVersion }} - name: Push to NuGet