Skip to content

Commit 4069b0f

Browse files
committed
update yaml + output package output folder
1 parent 9014aa8 commit 4069b0f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ jobs:
5555

5656
- name: Publish the package to GPR
5757
shell: pwsh
58-
run: dotnet nuget push "$((Resolve-Path packages/*.nupkg).Path)" -s https://nuget.pkg.github.com/tocsoft/index.json -k ${{secrets.GITHUB_TOKEN}}
58+
run: dotnet nuget push "$((Resolve-Path packages/*.nupkg).Path)" -s https://nuget.pkg.github.com/tocsoft/index.json -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
5959

6060
- name: Publish the package to nuget.org
6161
if: github.event_name == 'release' && github.event.action == 'created'
6262
shell: pwsh
63-
run: dotnet nuget push "$((Resolve-Path packages/*.nupkg).Path)" -k ${{secrets.NUGET_TOKEN}}
63+
run: dotnet nuget push "$((Resolve-Path packages/*.nupkg).Path)" -k ${{secrets.NUGET_TOKEN}} --skip-duplicate
6464

6565
publish-npm-pacakge:
6666
needs: test
@@ -89,13 +89,11 @@ jobs:
8989

9090
- name: Configure Github package registry
9191
shell: pwsh
92-
run: Set-Content -Path '.npmrc' -Value 'registry=https://dl.bintray.com/tocsoft/npm'
92+
run: Set-Content -Path '.npmrc' -Value "${{ secrets.BINTRAY_NPMRC }}"
9393

9494
- name: Publish npm package to Github package registry
9595
shell: pwsh
96-
run: npm publish "$((Resolve-Path packages/*.tgz).Path)"
97-
env:
98-
NODE_AUTH_TOKEN: ${{ secrets.BINTRAY_TOKEN }}
96+
run: npm publish "$((Resolve-Path packages/*.tgz).Path)" --registry https://api.bintray.com/npm/tocsoft/npm
9997

10098
- name: Configure npmjs package registry
10199
if: github.event_name == 'release' && github.event.action == 'created'

Tocsoft.GraphQLCodeGen.Npm/Tocsoft.GraphQLCodeGen.Npm.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PropertyGroup>
1717
<_PublishDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\binaries\'))</_PublishDir>
1818
<IsPackable>false</IsPackable>
19+
<_PackageOutputPath>$([System.IO.Path]::GetFullPath('$(PackageOutputPath)').TrimEnd('\').TrimEnd('/'))\</_PackageOutputPath>
1920
</PropertyGroup>
2021

2122
<MSBuild Projects="../Tocsoft.GraphQLCodeGen.Cli/Tocsoft.GraphQLCodeGen.Cli.csproj" Targets="PublishAll" Properties="PublishDir=$(_PublishDir)" />
@@ -26,7 +27,8 @@
2627
<!-- reset afterwards -->
2728
<Exec Command="npm version 1.0.0" />
2829

29-
<Move DestinationFiles="$(PackageOutputPath.TrimEnd('\').TrimEnd('/'))\tocsoft.graphql-codegen-$(PackageVersion).tgz" SourceFiles="tocsoft.graphql-codegen-$(PackageVersion).tgz" />
30+
<Move DestinationFiles="$(_PackageOutputPath)tocsoft.graphql-codegen-$(PackageVersion).tgz" SourceFiles="tocsoft.graphql-codegen-$(PackageVersion).tgz" />
31+
<Message Text="tocsoft.graphql-codegen-$(PackageVersion).tgz -> $(_PackageOutputPath)tocsoft.graphql-codegen-$(PackageVersion).tgz" Importance="high" />
3032
</Target>
3133

3234

0 commit comments

Comments
 (0)