diff --git a/.github/workflows/ci-copr.yml b/.github/workflows/ci-copr.yml index db02c9123dc..7820d756169 100644 --- a/.github/workflows/ci-copr.yml +++ b/.github/workflows/ci-copr.yml @@ -26,7 +26,7 @@ jobs: github_org_owner: LizardByte copr_ownername: lizardbyte auto_update_package: true - job_timeout: 60 + job_timeout: 90 secrets: COPR_BETA_WEBHOOK_TOKEN: ${{ secrets.COPR_BETA_WEBHOOK_TOKEN }} COPR_STABLE_WEBHOOK_TOKEN: ${{ secrets.COPR_STABLE_WEBHOOK_TOKEN }} diff --git a/.github/workflows/release-notifier-moonlight.yml b/.github/workflows/release-notifier-moonlight.yml index 9369a7fabc5..3cf18a37746 100644 --- a/.github/workflows/release-notifier-moonlight.yml +++ b/.github/workflows/release-notifier-moonlight.yml @@ -15,13 +15,13 @@ jobs: runs-on: ubuntu-latest steps: - name: discord - uses: sarisia/actions-status-discord@v1 # https://github.com/sarisia/actions-status-discord + uses: sarisia/actions-status-discord@v1 with: - webhook: ${{ secrets.DISCORD_RELEASE_WEBHOOK_MOONLIGHT }} + avatar_url: ${{ vars.ORG_LOGO_URL }}256 + color: 0x${{ vars.COLOR_HEX_GREEN }} + description: ${{ github.event.release.body }} nodetail: true nofail: false - username: ${{ secrets.DISCORD_USERNAME }} - avatar_url: ${{ secrets.ORG_LOGO_URL }} title: ${{ github.event.repository.name }} ${{ github.ref_name }} Released - description: ${{ github.event.release.body }} - color: 0xFF4500 + username: ${{ secrets.DISCORD_USERNAME }} + webhook: ${{ secrets.DISCORD_RELEASE_WEBHOOK_MOONLIGHT }} diff --git a/.github/workflows/update-flathub-repo.yml b/.github/workflows/update-flathub-repo.yml index 21411c77c95..5d5f0aea3cb 100644 --- a/.github/workflows/update-flathub-repo.yml +++ b/.github/workflows/update-flathub-repo.yml @@ -9,7 +9,8 @@ name: Update flathub repo on: release: - types: [released] + types: + - released concurrency: group: "${{ github.workflow }}-${{ github.event.release.tag_name }}" @@ -114,7 +115,7 @@ jobs: out-file-path: "flathub/${{ env.FLATHUB_PKG }}" extract: true - - name: Delete arhive + - name: Delete archive if: >- steps.check-label.outputs.hasTopic == 'true' && steps.check-release.outputs.isLatestRelease == 'true' @@ -172,6 +173,7 @@ jobs: git checkout $main_commit - name: Create/Update Pull Request + id: create-pr if: >- steps.check-label.outputs.hasTopic == 'true' && steps.check-release.outputs.isLatestRelease == 'true' && @@ -185,3 +187,20 @@ jobs: delete-branch: true title: "chore: Update ${{ env.FLATHUB_PKG }} to ${{ github.event.release.tag_name }}" body: ${{ github.event.release.body }} + + - name: Automerge PR + env: + GH_TOKEN: ${{ secrets.GH_BOT_TOKEN }} + if: >- + steps.check-label.outputs.hasTopic == 'true' && + steps.check-release.outputs.isLatestRelease == 'true' && + fromJson(steps.download.outputs.downloaded_files)[0] + run: | + gh \ + pr \ + merge \ + --auto \ + --delete-branch \ + --repo "flathub/${{ env.FLATHUB_PKG }}" \ + --squash \ + "${{ steps.create-pr.outputs.pull-request-number }}" diff --git a/.github/workflows/update-pacman-repo.yml b/.github/workflows/update-pacman-repo.yml index 92e14dc7cf2..edb95fde6ba 100644 --- a/.github/workflows/update-pacman-repo.yml +++ b/.github/workflows/update-pacman-repo.yml @@ -87,7 +87,16 @@ jobs: out-file-path: "pkgbuilds/${{ steps.prep.outputs.pkg_name }}" extract: true + - name: Remove pkg.tar.gz + if: >- + steps.check-label.outputs.hasTopic == 'true' && + steps.check-release.outputs.isLatestRelease == 'true' && + fromJson(steps.download.outputs.downloaded_files)[0] + run: | + rm -f "pkgbuilds/${{ steps.prep.outputs.pkg_name }}" + - name: Create/Update Pull Request + id: create-pr if: >- steps.check-label.outputs.hasTopic == 'true' && steps.check-release.outputs.isLatestRelease == 'true' && @@ -105,3 +114,19 @@ jobs: labels: | auto-approve auto-merge + + - name: Automerge PR + env: + GH_TOKEN: ${{ secrets.GH_BOT_TOKEN }} + if: >- + steps.check-label.outputs.hasTopic == 'true' && + steps.check-release.outputs.isLatestRelease == 'true' && + fromJson(steps.download.outputs.downloaded_files)[0] + run: | + gh \ + pr \ + merge \ + --auto \ + --delete-branch \ + --squash \ + "${{ steps.create-pr.outputs.pull-request-number }}" diff --git a/scripts/linux_build.sh b/scripts/linux_build.sh index e6a62d7e8c0..3bb9defbd2b 100644 --- a/scripts/linux_build.sh +++ b/scripts/linux_build.sh @@ -90,7 +90,7 @@ shift $((OPTIND -1)) # dependencies array to build out dependencies=() -function add_debain_based_deps() { +function add_debian_based_deps() { dependencies+=( "bison" # required if we need to compile doxygen "build-essential" @@ -133,8 +133,8 @@ function add_debain_based_deps() { fi } -function add_debain_deps() { - add_debain_based_deps +function add_debian_deps() { + add_debian_based_deps dependencies+=( "libayatana-appindicator3-dev" ) @@ -146,7 +146,7 @@ function add_ubuntu_deps() { ${sudo_cmd} add-apt-repository ppa:ubuntu-toolchain-r/test -y fi - add_debain_based_deps + add_debian_based_deps dependencies+=( "libappindicator3-dev" ) @@ -302,12 +302,12 @@ function run_install() { $package_update_command if [ "$distro" == "debian" ]; then - add_debain_deps + add_debian_deps elif [ "$distro" == "ubuntu" ]; then add_ubuntu_deps elif [ "$distro" == "fedora" ]; then add_fedora_deps - ${sudo_cmd} dnf group install "Development Tools" -y + ${sudo_cmd} dnf group install "$dev_tools_group" -y fi # Install the dependencies @@ -443,24 +443,26 @@ if grep -q "Debian GNU/Linux 12 (bookworm)" /etc/os-release; then cuda_build="525.60.13" gcc_version="12" nvm_node=0 -elif grep -q "PLATFORM_ID=\"platform:f39\"" /etc/os-release; then +elif grep -q "PLATFORM_ID=\"platform:f40\"" /etc/os-release; then distro="fedora" - version="39" + version="40" package_update_command="${sudo_cmd} dnf update -y" package_install_command="${sudo_cmd} dnf install -y" - cuda_version="12.4.0" - cuda_build="550.54.14" + cuda_version= + cuda_build= gcc_version="13" nvm_node=0 -elif grep -q "PLATFORM_ID=\"platform:f40\"" /etc/os-release; then + dev_tools_group="Development Tools" +elif grep -q "PLATFORM_ID=\"platform:f41\"" /etc/os-release; then distro="fedora" - version="40" + version="41" package_update_command="${sudo_cmd} dnf update -y" package_install_command="${sudo_cmd} dnf install -y" cuda_version= cuda_build= gcc_version="13" nvm_node=0 + dev_tools_group="development-tools" elif grep -q "Ubuntu 22.04" /etc/os-release; then distro="ubuntu" version="22.04"