Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build name convention standardization #6423

Merged
merged 6 commits into from
Jan 1, 2025
Merged

Build name convention standardization #6423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26984e1
standardize names for builds
efb4f5ff-1298-471a-8973-3d47447115dc Dec 20, 2024
f166042
Merge branch 'FreeTubeApp:development' into standardize-build-naming-…
efb4f5ff-1298-471a-8973-3d47447115dc Dec 20, 2024
04bcda4
use .deb and .rpm standard pkg name convention
efb4f5ff-1298-471a-8973-3d47447115dc Dec 22, 2024
2ad237d
include portable in name for 7z and zip builds
efb4f5ff-1298-471a-8973-3d47447115dc Dec 28, 2024
3e734ee
revert portable naming for mac builds
efb4f5ff-1298-471a-8973-3d47447115dc Dec 28, 2024
58bfde3
change names in flatpak workflow
efb4f5ff-1298-471a-8973-3d47447115dc Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,42 +117,42 @@ jobs:
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_linux_portable_x64
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-x64-portable.zip
path: build/freetube-${{ steps.versionNumber.outputs.result }}.zip

- name: Upload Linux .7z x64 Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_linux_portable_x64.7z
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-x64-portable.7z
path: build/freetube-${{ steps.versionNumber.outputs.result }}.7z

- name: Upload Linux .zip ARMv7l Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_linux_portable_armv7l
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-armv7l-portable.zip
path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.zip

- name: Upload Linux .7z ARMv7l Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_linux_portable_armv7l.7z
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-armv7l-portable.7z
path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.7z

- name: Upload Linux .zip ARM64 Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_linux_portable_arm64
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-arm64-portable.zip
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.zip

- name: Upload Linux .7z ARM64 Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_linux_portable_arm64.7z
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-arm64-portable.7z
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.7z

- name: Upload .deb x64 Artifact
Expand Down Expand Up @@ -180,28 +180,28 @@ jobs:
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.AppImage
name: freetube-${{ steps.versionNumber.outputs.result }}-amd64.AppImage
path: build/FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage

- name: Upload AppImage ARMv7l Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_armv7l.AppImage
name: freetube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage
path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage

- name: Upload AppImage ARM64 Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_arm64.AppImage
name: freetube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage
path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage

- name: Upload .rpm x64 Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.rpm
name: freetube-${{ steps.versionNumber.outputs.result }}.amd64.rpm
PikachuEXE marked this conversation as resolved.
Show resolved Hide resolved
path: build/freetube-${{ steps.versionNumber.outputs.result }}.x86_64.rpm

# rpm are not built for armv7l
Expand All @@ -210,42 +210,42 @@ jobs:
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_arm64.rpm
name: freetube-${{ steps.versionNumber.outputs.result }}.arm64.rpm
path: build/freetube-${{ steps.versionNumber.outputs.result }}.aarch64.rpm

- name: Upload Alpine .apk x64 Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_alpine_amd64.apk
name: freetube-${{ steps.versionNumber.outputs.result }}-alpine-amd64.apk
path: build/freetube-${{ steps.versionNumber.outputs.result }}.apk

- name: Upload Alpine .apk ARMv7l Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_alpine_armv7l.apk
name: freetube-${{ steps.versionNumber.outputs.result }}-alpine-armv7l.apk
path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.apk

- name: Upload Alpine .apk ARM64 Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_alpine_arm64.apk
name: freetube-${{ steps.versionNumber.outputs.result }}-alpine-arm64.apk
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.apk

- name: Upload Pacman .pacman x64 Artifact
uses: actions/upload-artifact@v4
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
with:
name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.pacman
name: freetube-${{ steps.versionNumber.outputs.result }}-amd64.pacman
path: build/freetube-${{ steps.versionNumber.outputs.result }}.pacman

# - name: Upload Web Build
# uses: actions/upload-artifact@v4
# if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
# with:
# name: freetube_${{ steps.versionNumber.outputs.result }}_static_web
# name: freetube-${{ steps.versionNumber.outputs.result }}-static-web
# path: dist/web

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

- name: Upload Windows x64 .7z Artifact
Expand All @@ -280,7 +280,7 @@ jobs:
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
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.zip
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.zip

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

- 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 }}-portable-arm64.exe
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.exe
path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe

- name: Upload Mac x64 .dmg Artifact
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/flatpak.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,24 @@ jobs:
with:
version: v${{ steps.sub.outputs.result }}-beta
repository: FreeTubeApp/FreeTube
file: freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip
file: freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip
- name: Download ARM Release
uses: fabriciobastian/[email protected]
with:
version: v${{ steps.sub.outputs.result }}-beta
repository: FreeTubeApp/FreeTube
file: freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip
file: freetube-${{ steps.sub.outputs.result }}-linux-arm64-portable.zip
- name: Set x64 Hash Variable
id: hash-x64
run: |
echo 'HASH_X64<<EOF' >> $GITHUB_ENV
sha256sum freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip | awk '{print $1}' >> $GITHUB_ENV
sha256sum freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip | awk '{print $1}' >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
- name: Set ARM Hash Variable
id: hash-arm64
run: |
echo 'HASH_ARM64<<EOF' >> $GITHUB_ENV
sha256sum freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip | awk '{print $1}' >> $GITHUB_ENV
sha256sum freetube-${{ steps.sub.outputs.result }}-linux-arm64-portable.zip | awk '{print $1}' >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
- name: Set Date Variable
id: current-date
Expand All @@ -80,7 +80,7 @@ jobs:
uses: mikefarah/[email protected]
with:
# The Command which should be run
cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip"' io.freetubeapp.FreeTube.yml
cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip"' io.freetubeapp.FreeTube.yml
- name: Update x64 Hash in yml File
uses: mikefarah/[email protected]
with:
Expand All @@ -90,7 +90,7 @@ jobs:
uses: mikefarah/[email protected]
with:
# The Command which should be run
cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip"' io.freetubeapp.FreeTube.yml
cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-arm64-portable.zip"' io.freetubeapp.FreeTube.yml
- name: Update ARM Hash in yml File
uses: mikefarah/[email protected]
with:
Expand All @@ -100,8 +100,8 @@ jobs:
run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
- name: Remove Release Files
run: |
rm freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip
rm freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip
rm freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip
rm freetube-${{ steps.sub.outputs.result }}-linux-arm64-portable.zip
- name: Commit Files
uses: stefanzweifel/git-auto-commit-action@v5
with:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_amd64.AppImage
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-amd64.AppImage
asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}.AppImage
asset_content_type: application/vnd.appimage

Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-portable-x64.zip
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-x64-portable.zip
efb4f5ff-1298-471a-8973-3d47447115dc marked this conversation as resolved.
Show resolved Hide resolved
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.zip
asset_content_type: application/zip

Expand All @@ -135,7 +135,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-portable-x64.7z
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-x64-portable.7z
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.7z
asset_content_type: application/x-7z-compressed

Expand All @@ -146,7 +146,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-portable-armv7l.zip
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-armv7l-portable.zip
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.zip
asset_content_type: application/zip

Expand All @@ -157,7 +157,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-portable-armv7l.7z
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-armv7l-portable.7z
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.7z
asset_content_type: application/x-7z-compressed

Expand All @@ -168,7 +168,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-portable-arm64.zip
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-arm64-portable.zip
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.zip
asset_content_type: application/zip

Expand All @@ -179,7 +179,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-portable-arm64.7z
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-arm64-portable.7z
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.7z
asset_content_type: application/x-7z-compressed

Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_amd64.rpm
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}.amd64.rpm
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.x86_64.rpm
asset_content_type: application/x-rpm

Expand All @@ -236,7 +236,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_arm64.rpm
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}.arm64.rpm
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.aarch64.rpm
asset_content_type: application/x-rpm

Expand Down
Loading