Test gh_release

gardenlinux · Nov 24, 2023 · e808ec5 · e808ec5
1 parent 49de49b
commit e808ec5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml
@@ -38,6 +38,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: gardenlinux/package-build
+          ref: feature/5-remove-pkg-yml
       - run: mkdir input output
       - uses: actions/checkout@v4
         with:
@@ -87,12 +88,8 @@ jobs:
       - name: draft release and upload source packages
         id: release
         if: ${{ steps.check.outputs.skip_release != 'true' }}
-        env:
-          ARTIFACT_NAME: ${{ steps.build.outputs.pkg }}
-          ARTIFACT_COMMIT: ${{ github.sha }}
         run: |
-          ARTIFACT_TAG=${ARTIFACT_NAME/\~/\_}
-          release="$(./scripts/gh_release "${{ github.token }}" "${{ github.repository }}" create --draft "${ARTIFACT_TAG}" "${ARTIFACT_COMMIT}" "${ARTIFACT_NAME}")"
+          release="$(./scripts/gh_release "${{ github.token }}" "${{ github.repository }}" create --draft "${{ steps.build.outputs.pkg }}" "${{ github.sha }}" "${{ steps.build.outputs.pkg }}")"
           for f in output/*; do
             ./scripts/gh_release "${{ github.token }}" "${{ github.repository }}" upload "$release" "$f"
           done
@@ -113,6 +110,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: gardenlinux/package-build
+          ref: feature/5-remove-pkg-yml
       - name: setup binfmt
         if: ${{ matrix.arch == 'arm64v8' }}
         run: sudo podman run --privileged ghcr.io/gardenlinux/binfmt_container
@@ -170,6 +168,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: gardenlinux/package-build
+          ref: feature/5-remove-pkg-yml
       - name: publish drafted release
         run: ./scripts/gh_release "${{ github.token }}" "${{ github.repository }}" publish_draft "${{ needs.source.outputs.release }}"
   cleanup:

diff --git a/scripts/gh_release b/scripts/gh_release
@@ -64,6 +64,8 @@ case "$action" in
 		commit="$1"; shift
 		name="$1"; shift
 
+		normalized_tag=${name/\~/\_}
+
 		release="$(post "releases" '{
 			"draft": '"$draft"',
 			"tag_name": "'"$tag"'",
@@ -78,16 +80,25 @@ case "$action" in
 		release="$1"; shift
 		asset_file="$1"; shift
 
-		asset_name="$(basename "$asset_file")"
+		normalized_asset_file=${asset_file/\~/\_}
+
+		asset_name="$(basename "$normalized_asset_file")"
 		upload "releases/$release/assets?name=$asset_name" < "$asset_file" > /dev/null
-		echo "uploaded $asset_file to $release"
+		echo "uploaded $asset_file to $release ($asset_name)"
 
 		;;
 	"download")
 		release="$1"; shift
 		name="$1"; shift
 
-		asset_id="$(get "releases/$release/assets" | jq -r '.[] | select(.name == "'"$name"'") | .id')"
+		echo $name
+
+		normalized_name=${name/\~/\_}
+
+		echo $normalized_name
+		get "releases/$release/assets"
+
+		asset_id="$(get "releases/$release/assets" | jq -r '.[] | select(.name == "'"$normalized_name"'") | .id')"
 		get_binary "releases/assets/$asset_id" > "$name"
 
 		;;