Rebase on main

This commit is contained in:
cochcoder
2025-02-18 13:40:13 -05:00
parent f4fa9b1be9
commit c742459b14
5 changed files with 43 additions and 85 deletions

View File

@@ -48,13 +48,7 @@ jobs:
matrix:
include:
- os: ubuntu-20.04
arch: x86_64
- os: ubuntu-20.04
arch: aarch64
- os: ubuntu-24.04
arch: x86_64
- os: ubuntu-24.04
arch: aarch64
- os: windows-latest
- os: macos-14
arch: x86_64
@@ -68,15 +62,7 @@ jobs:
secrets: inherit
flatpak:
name: "Flatpak"
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: ubuntu-latest
arch: x86_64
- os: ubuntu-latest
arch: aarch64
fail-fast: false
runs-on: ubuntu-latest
env:
date:
ver:
@@ -106,15 +92,15 @@ jobs:
echo "ver_pure=$ver_pure" >> $GITHUB_ENV
echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
shell: bash
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
- uses: flatpak/flatpak-github-actions/flatpak-builder@master
with:
bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}.flatpak
manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml
cache: true
arch: ${{ matrix.arch }}
upload-artifact: false
- name: Deploy Flatpak to nightly release
if: ${{github.ref == 'refs/heads/main'}}
uses: WebFreak001/deploy-nightly@v3.1.0
uses: WebFreak001/deploy-nightly@v3.2.0
with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723