github.workflow: Makes a stand-alone package.

That will ensure clients that they can link with indirect dependencies.

Author: Victor Paleologue

.github/workflows/make_feed.sh

@@ -13,14 +13,12 @@ echo "<toolchain>" > feed.xml
 for URL in $PACKAGES_URLS; do
     ZIP=package.zip
     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)" -)
+    PACKAGE_XML_IN_ZIP=$(zipinfo -1 $ZIP | grep package.xml)
+    NAME=$(unzip -p $ZIP $PACKAGE_XML_IN_ZIP | xmllint --xpath "string(/package/@name)" -)
+    VERSION=$(unzip -p $ZIP $PACKAGE_XML_IN_ZIP | xmllint --xpath "string(/package/@version)" -)
     echo "  <package name=\"${NAME}\" version=\"${VERSION}\" url=\"${URL}\" />" >> feed.xml
     rm $ZIP
 done
-
-echo "Adding sub-toolchain from ${FEED}"
-echo "  <feed url=\"${FEED}\" />" >> feed.xml
 echo "</toolchain>" >> feed.xml
 
 realpath feed.xml

.github/workflows/release.yml

@@ -40,8 +40,13 @@ jobs:
     - name: Set Version
       run: xmlstarlet ed --inplace -i '/project/qibuild' -t attr -n version -v `git describe --tags` qiproject.xml
 
+    # Outputs the package as a .zip in ./package/
+    # KLUDGE: we use --standalone to include all the dependencies in it,
+    # otherwise qibuild does not know where to find them
+    # when libqi is used in another project.
     - name: Build QiToolchain Package # Outputs the package as a .zip in ./package/
-      run: qibuild package -c qisdk --release -DQI_WITH_TESTS=OFF -DCMAKE_CXX_FLAGS=-pthread
+      run: qibuild package --standalone -c qisdk --release -DQI_WITH_TESTS=OFF -DCMAKE_CXX_FLAGS=-pthread
+
 
     - name: Release Package
       uses: "marvinpinto/action-automatic-releases@latest"