Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/LinwoodDev/Flow into dev…
Browse files Browse the repository at this point in the history
…elop
  • Loading branch information
CodeDoctorDE committed Dec 28, 2023
2 parents 0428d19 + 0fa7b27 commit 150d28d
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
44 changes: 22 additions & 22 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
flutter build apk -v --release --flavor production
cp build/app/outputs/flutter-apk/app-production-release.apk linwood-flow-android.apk
- name: Archive
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: apk-build
path: app/linwood-flow-android.apk
Expand Down Expand Up @@ -98,13 +98,13 @@ jobs:
run: |
cp scripts/start.bat build/windows/x64/runner/Release/
- name: Archive
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows-build
path: |
app/build/windows/x64/runner/Release/**
- name: Archive
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows-setup
path: |
Expand Down Expand Up @@ -197,25 +197,25 @@ jobs:
chmod +x scripts/start.sh
cp scripts/start.sh build/linux/x64/release/bundle
- name: Archive
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-build
path: |
app/build/linux/x64/release/bundle/**
- name: Archive .deb
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-deb
path: |
app/linwood-flow-linux.deb
- name: Archive .rpm
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-rpm
path: |
app/build/linwood-flow-linux.rpm
- name: Archive .AppImage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-appimage
path: |
Expand Down Expand Up @@ -299,12 +299,12 @@ jobs:
# flatpak build-export export flatpak_app -v
# flatpak build-bundle export linwood-flow-linux.flatpak dev.linwood.flow -v
# - name: Upload .flatpak artifact to workflow
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: linux-flatpak
# path: app/linwood-flow-linux.flatpak
- name: Archive old portable
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-alternative-portable
path: app/build/linux/x64/release/bundle
Expand Down Expand Up @@ -350,13 +350,13 @@ jobs:
run: |
appdmg DmgSetup.json linwood-flow-macos.dmg
- name: Archive
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macos-build
path: |
app/build/macos/Build/Products/Release/linwood-flow-macos.zip
- name: Archive
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macos-dmg
path: |
Expand All @@ -377,7 +377,7 @@ jobs:
# id: build
# with:
# architecture: ${{ matrix.architecture }}
# - uses: actions/upload-artifact@v3
# - uses: actions/upload-artifact@v4
# with:
# name: flow-snap
# path: ${{ steps.build.outputs.snap }}
Expand Down Expand Up @@ -413,37 +413,37 @@ jobs:
echo "FLOW_BUILD_NUMBER=${FLOW_BUILD_NUMBER}" >> $GITHUB_OUTPUT
git config --global user.email "[email protected]"
git config --global user.name "Linwood CI"
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: apk-build
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: windows-build
path: windows-build/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: linux-build
path: linux-build/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: linux-deb
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: linux-rpm
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: linux-appimage
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: linux-alternative-portable
path: linux-alternative-portable/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: windows-setup
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: macos-build
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: macos-dmg
- name: 📦 Zip artifacts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ jobs:
echo '' >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
- name: Discord Webhook Action
uses: tsickert/discord-webhook@v5.3.0
uses: tsickert/discord-webhook@v5.4.0
if: ${{ github.event.inputs.stable == 'true' || github.ref == 'refs/heads/main' }}
with:
webhook-url: ${{ secrets.WEBHOOK_URL }}
Expand All @@ -264,7 +264,7 @@ jobs:
Download it here: https://docs.flow.linwood.dev/downloads
https://github.com/LinwoodDev/flow/releases/tag/v${{ env.FLOW_VERSION }}
- name: Discord Webhook Action
uses: tsickert/discord-webhook@v5.3.0
uses: tsickert/discord-webhook@v5.4.0
if: ${{ github.event.inputs.stable == 'false' && github.ref == 'refs/heads/develop' }}
with:
webhook-url: ${{ secrets.WEBHOOK_URL }}
Expand Down

0 comments on commit 150d28d

Please sign in to comment.