Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: rockspec info JSON was generated incorrectly #88

Merged
merged 2 commits into from
Feb 7, 2024
Merged

fix: rockspec info JSON was generated incorrectly #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7368b1
fix: rockspec info JSON was generated incorrectly
cwaldren-ld Feb 7, 2024
79e662c
ci: add -r option to jq in manual publish
cwaldren-ld Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- id: set-matrix
run: |
data=$(echo ${{ needs.rockspec-info.outputs.info }} | jq -c 'to_entries | map(.value.rockspec)')
data=$(echo '${{ needs.rockspec-info.outputs.info }}' | jq -c 'to_entries | map(.value.rockspec)')
echo "matrix=$data" >> $GITHUB_OUTPUT

linux-build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Get package name
id: pkg-info
run: |
rockspec=$(echo ${{ needs.rockspec-info.outputs.info }} | jq '.${{ matrix.package }}.rockspec')
rockspec=$(echo '${{ needs.rockspec-info.outputs.info }}' | jq -r '.${{ matrix.package }}.rockspec')
echo "package=$rockspec" >> $GITHUB_OUTPUT

- uses: ./.github/actions/ci
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/rockspec-info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ jobs:
echo "version=$version" >> $GITHUB_OUTPUT
- name: Construct rockspec package names
id: pkg-info
env:
V: ${{ steps.manifest.outputs.version }}
run: |
echo 'info<<EOF' >> $GITHUB_OUTPUT
echo '"{' >> $GITHUB_OUTPUT
echo '\"server\":{\"version\":\"${{ steps.manifest.outputs.version }}\",\"rockspec\":\"launchdarkly-server-sdk-${{ steps.manifest.outputs.version }}-0.rockspec\"},' >> $GITHUB_OUTPUT
echo '\"redis\":{\"version\":\"${{ steps.manifest.outputs.version }}\",\"rockspec\":\"launchdarkly-server-sdk-redis-${{ steps.manifest.outputs.version }}-0.rockspec\"}' >> $GITHUB_OUTPUT
echo '}"' >> $GITHUB_OUTPUT
echo 'EOF' >> $GITHUB_OUTPUT
json=$(echo 'null' | jq -c '{
"server":{"version":"${{ env.V }}","rockspec":"launchdarkly-server-sdk-${{ env.V }}-0.rockspec"},
"redis":{"version":"${{ env.V }}","rockspec":"launchdarkly-server-sdk-redis-${{ env.V }}-0.rockspec"}
}')
echo "info=$json" >> $GITHUB_OUTPUT
Loading