From 588a6cd5ae30e37b907c425a790bd608cee510f0 Mon Sep 17 00:00:00 2001
From: Ben Limmer <ben@benlimmer.com>
Date: Wed, 8 Jun 2022 21:38:32 -0600
Subject: [PATCH] fix: pypi and github package publishing

---
 .github/workflows/release.yml | 4 ++--
 .projenrc.js                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 764b471f..e4b55dab 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -128,7 +128,7 @@ jobs:
         run: npx -p publib@latest publib-maven
         env:
           MAVEN_SERVER_ID: github
-          MAVEN_REPOSITORY_URL: https://maven.pkg.github.com
+          MAVEN_REPOSITORY_URL: https://maven.pkg.github.com/${{ github.repository }}
           MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
           MAVEN_USERNAME: ${{ github.actor }}
   release_pypi:
@@ -162,7 +162,7 @@ jobs:
         run: npx -p publib@latest publib-pypi
         env:
           TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPY_TOKEN }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
   release_nuget:
     name: Publish to NuGet Gallery
     needs: release
diff --git a/.projenrc.js b/.projenrc.js
index dc849b97..44bb4d36 100644
--- a/.projenrc.js
+++ b/.projenrc.js
@@ -28,13 +28,13 @@ const project = new awscdk.AwsCdkConstructLibrary({
 
   publishToPypi: {
     twineUsernameSecret: 'TWINE_USERNAME', // this resolves to __token__ to use token auth
-    twinePasswordSecret: 'PYPY_TOKEN',
+    twinePasswordSecret: 'PYPI_TOKEN',
     distName: 'cdk-datadog-integration',
     module: 'cdk_datadog_integration',
   },
 
   publishToMaven: {
-    mavenRepositoryUrl: 'https://maven.pkg.github.com',
+    mavenRepositoryUrl: 'https://maven.pkg.github.com/${{ github.repository }}',
     javaPackage: 'com.benlimmer.cdkdatadogintegration',
     mavenGroupId: 'com.benlimmer',
     mavenArtifactId: 'cdk-datadog-integration',