Skip to content

Commit

Permalink
Merge branch 'development' into custom-builds/current
Browse files Browse the repository at this point in the history
* development: (23 commits)
  Translated using Weblate (Czech)
  Translated using Weblate (German)
  Translated using Weblate (Basque)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (German)
  Translated using Weblate (Basque)
  Translated using Weblate (German)
  Stay in fullscreen/fullwindow/PiP + default viewing mode setting (FreeTubeApp#5903)
  Undo Feature For Remove From Playlist. (FreeTubeApp#5885)
  group builds (FreeTubeApp#6497)
  Change CREATE_NEW_WINDOW IPC call to accept a path and query (FreeTubeApp#6595)
  Bump shaka-player from 4.12.7 to 4.12.8 (FreeTubeApp#6609)
  Bump electron from 33.3.1 to 34.0.0 (FreeTubeApp#6608)
  Translated using Weblate (French)
  Bump sass from 1.83.1 to 1.83.4 (FreeTubeApp#6607)
  Bump lefthook from 1.10.3 to 1.10.9 (FreeTubeApp#6606)
  Bump eslint-plugin-jsdoc from 50.6.1 to 50.6.2 in the eslint group (FreeTubeApp#6604)
  Translated using Weblate (Czech)
  Translated using Weblate (Estonian)
  Translated using Weblate (German)
  ...
  • Loading branch information
PikachuEXE committed Jan 21, 2025
2 parents 400c0ef + 96378ef commit a922fe0
Show file tree
Hide file tree
Showing 32 changed files with 621 additions and 331 deletions.
48 changes: 24 additions & 24 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -255,12 +255,12 @@ jobs:
name: freetube-${{ steps.versionNumber.outputs.result }}-setup-x64.exe
path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe

- name: Upload Windows arm64 .exe Artifact
- name: Upload Windows x64 Portable Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
with:
name: freetube-${{ steps.versionNumber.outputs.result }}-setup-arm64.exe
path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.exe
path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe

- name: Upload Windows x64 .zip Artifact
uses: actions/upload-artifact@v4
Expand All @@ -276,33 +276,33 @@ jobs:
name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.7z
path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.7z

- name: Upload Windows arm64 .zip Artifact
- name: Upload Windows arm64 .exe Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
with:
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.zip
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.zip
name: freetube-${{ steps.versionNumber.outputs.result }}-setup-arm64.exe
path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe

- name: Upload Windows arm64 .7z Artifact
- name: Upload Windows arm64 Portable Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
with:
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.7z
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.7z
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.exe
path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe

- name: Upload Windows x64 Portable Artifact
- name: Upload Windows arm64 .zip Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
with:
name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.exe
path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.zip
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.zip

- name: Upload Windows arm64 Portable Artifact
- name: Upload Windows arm64 .7z Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
with:
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.exe
path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.7z
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.7z

- name: Upload Mac x64 .dmg Artifact
uses: actions/upload-artifact@v4
Expand All @@ -311,13 +311,6 @@ jobs:
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg

- name: Upload Mac arm64 .dmg Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
with:
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg

- name: Upload Mac x64 .zip Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
Expand All @@ -332,6 +325,13 @@ jobs:
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z

- name: Upload Mac arm64 .dmg Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
with:
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg

- name: Upload Mac arm64 .zip Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
Expand Down
Loading

0 comments on commit a922fe0

Please sign in to comment.