From 5af1e01104763ba03ec5c19ecb2c8d3e86273beb Mon Sep 17 00:00:00 2001
From: Victor Paleologue <victor.paleologue@softbankrobotics.com>
Date: Mon, 26 Jul 2021 17:46:46 +0200
Subject: [PATCH] Fix feed release

---
 .github/workflows/release.yml | 21 ++++++++++++---------
 scripts/make_feed.sh          |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cb7e9ac..c12d477 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,21 +60,24 @@ jobs:
       working-directory: scripts/openssl
       run: sudo bash build.sh
 
-    - uses: "marvinpinto/action-automatic-releases@latest"
+    - name: Release Packages
+      uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         prerelease: false
         files: |
           /opt/workspace/*.zip
-      id: "first_release_step"
+      id: "release"
 
-    - name: Make QiToolchain Feed
+    - name: Make Feed
       run: scripts/make_feed.sh
 
-    - uses: "marvinpinto/action-automatic-releases@latest"
+    - name: Release Feed
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
       with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        prerelease: false
-        files: |
-          feed.xml
-      id: "second_release_step"
+        upload_url: ${{ steps.release.outputs.upload_url }}
+        asset_path: feed.xml
+        asset_name: feed.xml
+        asset_content_type: application/xml
diff --git a/scripts/make_feed.sh b/scripts/make_feed.sh
index 1caaa10..6c60654 100755
--- a/scripts/make_feed.sh
+++ b/scripts/make_feed.sh
@@ -13,7 +13,7 @@ for URL in $PACKAGES_URLS; do
     wget -q $URL -O $ZIP;
     NAME=$(unzip -p $ZIP package.xml | xmllint --xpath "string(/package/@name)" -)
     VERSION=$(unzip -p $ZIP package.xml | xmllint --xpath "string(/package/@version)" -)
-    echo "  <package name=${NAME} version=${VERSION} url=\"${URL}\" />" >> feed.xml
+    echo "  <package name=\"${NAME}\" version=\"${VERSION}\" url=\"${URL}\" />" >> feed.xml
     rm $ZIP
 done
 echo "</toolchain>" >> feed.xml