From 12151d2ae267e3c5872ba18e298b80ecd95fb389 Mon Sep 17 00:00:00 2001
From: flightlessmango <flightlessmangoyt@gmail.com>
Date: Wed, 3 Apr 2024 19:29:12 +0200
Subject: [PATCH] release: fix package and source

---
 .github/workflows/build-package.yml | 17 ++++++++++-------
 .github/workflows/build-source.yml  | 13 +++++++++++--
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
index 6b11c9b1..6840c8a0 100644
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@@ -2,11 +2,6 @@ name: Build release package
 on:
   release:
     types: [published]
-#  push:
-#    tags: ["v*"]
-#    branches:
-#      - main
-  workflow_dispatch:
 
 jobs:
   build:
@@ -16,9 +11,14 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install build tools
         run: |
+          set -x
+          dpkg --add-architecture i386
           sudo apt update
-          sudo apt install gcc-multilib g++-multilib ninja-build python3-setuptools python3-wheel mesa-common-dev libxnvctrl-dev libdbus-1-dev python3-numpy python3-matplotlib unzip hub
-          sudo pip3 install 'meson>=0.60' mako
+          sudo apt -y install gcc-multilib g++-multilib ninja-build python3-setuptools \
+                              python3-wheel mesa-common-dev libxnvctrl-dev libdbus-1-dev \
+                              python3-numpy python3-matplotlib unzip hub libxkbcommon-dev libwayland-dev wget unzip \
+                              libxkbcommon-dev:i386 libwayland-dev:i386
+          sudo pip3 --no-input install 'meson>=0.60' mako
           wget https://github.com/KhronosGroup/glslang/releases/download/SDK-candidate-26-Jul-2020/glslang-master-linux-Release.zip
           unzip glslang-master-linux-Release.zip bin/glslangValidator
           sudo install -m755 bin/glslangValidator /usr/local/bin/
@@ -43,7 +43,10 @@ jobs:
           ./build.sh build -Dwerror=true package release
       - name: Upload release
         if: ${{ github.event_name == 'release' && github.event.action == 'published' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          set -x
           assets=()
           for asset in ./MangoHud-*-Source*.tar.*; do
             assets+=("-a" "$asset")
diff --git a/.github/workflows/build-source.yml b/.github/workflows/build-source.yml
index 284b67ab..95d1282d 100644
--- a/.github/workflows/build-source.yml
+++ b/.github/workflows/build-source.yml
@@ -11,11 +11,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Run build-source.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -x
           sudo apt update
-          sudo apt install gcc g++ ninja-build python3-pip python3-setuptools python3-wheel pkg-config mesa-common-dev libx11-dev libxnvctrl-dev libdbus-1-dev glslang-tools
-          sudo pip3 install 'meson>=0.60' mako
+          sudo apt -y install gcc g++ ninja-build python3-pip python3-setuptools python3-wheel pkg-config mesa-common-dev libx11-dev libxnvctrl-dev libdbus-1-dev glslang-tools hub libxkbcommon-dev libwayland-dev wget unzip
+          sudo pip3 --no-input install 'meson>=0.60' mako
           ./build-source.sh
           assets=()
           for asset in ./MangoHud-*-Source*.tar.*; do
@@ -24,3 +26,10 @@ jobs:
           tag_name="${GITHUB_REF##*/}"
           hub release edit "${assets[@]}" -m "" "$tag_name"
           #hub release create "${assets[@]}" -m "$tag_name" "$tag_name"
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        continue-on-error: true
+        with:
+          name: MangoHud-${{steps.git-vars.outputs.artifact-metadata}}
+          path: ${{runner.workspace}}/MangoHud/build/MangoHud-*tar.gz
+          retention-days: 30
\ No newline at end of file