From ea1177043953d2c38c95b3b46f659aedf2b69ff3 Mon Sep 17 00:00:00 2001 From: Casey Waldren Date: Tue, 6 Feb 2024 17:34:46 -0800 Subject: [PATCH] fix: publish step should take rockspec inputs (#85) --- .github/workflows/manual-publish-docs.yml | 3 --- .github/workflows/release-please.yml | 8 ++++---- .github/workflows/rockspec-info.yml | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/manual-publish-docs.yml b/.github/workflows/manual-publish-docs.yml index b86a8f3..2b523d8 100644 --- a/.github/workflows/manual-publish-docs.yml +++ b/.github/workflows/manual-publish-docs.yml @@ -11,9 +11,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Build and Test - uses: ./.github/actions/ci - - name: Build documentation uses: ./.github/actions/build-docs diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index b93f62a..227bc61 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -78,12 +78,12 @@ jobs: ssm_parameter_pairs: '/production/common/releasing/luarocks/token = LUAROCKS_API_TOKEN' - uses: ./.github/actions/ci with: - rockspec: ${{ fromJSON(needs.rockspec-info.outputs.info).server }} + rockspec: ${{ fromJSON(needs.rockspec-info.outputs.info).server.rockspec }} - uses: ./.github/actions/publish name: Publish server package with: dry_run: 'false' - rockspec: ${{ fromJSON(needs.rockspec-info.outputs.info).server }} + rockspec: ${{ fromJSON(needs.rockspec-info.outputs.info).server.rockspec }} publish-redis: permissions: # Needed for access to the LuaRocks token @@ -100,9 +100,9 @@ jobs: ssm_parameter_pairs: '/production/common/releasing/luarocks/token = LUAROCKS_API_TOKEN' - uses: ./.github/actions/ci with: - rockspec: ${{ fromJSON(needs.rockspec-info.outputs.info).redis }} + rockspec: ${{ fromJSON(needs.rockspec-info.outputs.info).redis.rockspec }} - uses: ./.github/actions/publish name: Publish redis package with: dry_run: 'false' - rockspec: ${{ fromJSON(needs.rockspec-info.outputs.info).redis }} + rockspec: ${{ fromJSON(needs.rockspec-info.outputs.info).redis.rockspec }} diff --git a/.github/workflows/rockspec-info.yml b/.github/workflows/rockspec-info.yml index 3741098..d68dc03 100644 --- a/.github/workflows/rockspec-info.yml +++ b/.github/workflows/rockspec-info.yml @@ -16,7 +16,7 @@ jobs: - name: Fetch release please manifest id: manifest run: | - version=$(jq '."."' < .release-please-manifest.json) + version=$(jq --raw-output '."."' < .release-please-manifest.json) echo "version=$version" >> $GITHUB_OUTPUT - name: Construct rockspec package names id: pkg-info