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

ci: Remove epoch_finish timestamp from release & Update actions #147

Merged
merged 5 commits into from
Feb 3, 2024
Merged

ci: Remove epoch_finish timestamp from release & Update actions #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d08a0e
ci: Remove `epoch_finish` timestamp from release info
Cubik65536 Jan 29, 2024
fdb2d13
ci: Update artifact upload/download actions to `v4`
Cubik65536 Jan 30, 2024
fa5719d
ci: Update `actions/checkout` to `v4`
Cubik65536 Jan 31, 2024
88cdd34
ci: Add artifact upload overwrite
Cubik65536 Jan 31, 2024
a4e310e
Update to ungoogled-chromium 121.0.6167.139
Cubik65536 Feb 3, 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
9 changes: 4 additions & 5 deletions .github/scripts/github_generate_release_note.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@ _root_dir=$(dirname $(greadlink -f $0))
_chromium_version=$(cat $_root_dir/ungoogled-chromium/chromium_version.txt)
_ungoogled_revision=$(cat $_root_dir/ungoogled-chromium/revision.txt)
_package_revision=$(cat $_root_dir/revision.txt)
_epoch_finish=$(date +%s)

_x64_hash_name="ungoogled-chromium_${_chromium_version}-${_ungoogled_revision}.${_package_revision}_x86-64-macos.dmg.hashes.md"
_arm64_hash_name="ungoogled-chromium_${_chromium_version}-${_ungoogled_revision}.${_package_revision}_arm64-macos.dmg.hashes.md"
_release_tag_version="${_chromium_version}-${_ungoogled_revision}.${_package_revision}__${_epoch_finish}"
_release_tag_version="${_chromium_version}-${_ungoogled_revision}.${_package_revision}"

_gh_run_href="https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"

touch ./github_release_note.md
printf '## Ungoogled-Chromium %s\n' "$_release_tag_version" | tee -a ./github_release_note.md
printf '\n' | tee -a ./github_release_note.md
cat $_x64_hash_name | tee -a ./github_release_note.md
printf '## Ungoogled-Chromium macOS %s\n' "$_release_tag_version" | tee -a ./github_release_note.md
printf '\n' | tee -a ./github_release_note.md
cat $_arm64_hash_name | tee -a ./github_release_note.md
printf '\n' | tee -a ./github_release_note.md
cat $_x64_hash_name | tee -a ./github_release_note.md
printf '\n' | tee -a ./github_release_note.md
printf 'See [this GitHub Actions Run](%s) for the [Workflow file](%s/workflow) used as well as the build logs and artifacts\n' "$_gh_run_href" "$_gh_run_href" | tee -a ./github_release_note.md
1 change: 0 additions & 1 deletion .github/scripts/github_prepare_artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ if [[ -f "$_root_dir/build_finished_$_arch.log" ]] ; then
_chromium_version=$(cat $_root_dir/ungoogled-chromium/chromium_version.txt)
_ungoogled_revision=$(cat $_root_dir/ungoogled-chromium/revision.txt)
_package_revision=$(cat $_root_dir/revision.txt)
_epoch_finish=$(date +%s)

_cpu=x86-64; grep -qF arm64 "$_src_dir/out/Default/args.gn" && _cpu=arm64
_file_name="ungoogled-chromium_${_chromium_version}-${_ungoogled_revision}.${_package_revision}_${_cpu}-macos.dmg"
Expand Down
5 changes: 2 additions & 3 deletions .github/scripts/github_prepare_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ _root_dir=$(dirname $(greadlink -f $0))
_chromium_version=$(cat $_root_dir/ungoogled-chromium/chromium_version.txt)
_ungoogled_revision=$(cat $_root_dir/ungoogled-chromium/revision.txt)
_package_revision=$(cat $_root_dir/revision.txt)
_epoch_finish=$(date +%s)

_x64_file_name="ungoogled-chromium_${_chromium_version}-${_ungoogled_revision}.${_package_revision}_x86-64-macos.dmg"
_arm64_file_name="ungoogled-chromium_${_chromium_version}-${_ungoogled_revision}.${_package_revision}_arm64-macos.dmg"
_release_tag_version="${_chromium_version}-${_ungoogled_revision}.${_package_revision}__${_epoch_finish}"
_release_name="Ungoogled-Chromium macOS ${_release_tag_version}"
_release_tag_version="${_chromium_version}-${_ungoogled_revision}.${_package_revision}"
_release_name="${_release_tag_version}"
Cubik65536 marked this conversation as resolved.
Show resolved Hide resolved

echo "x64_file_name=$_x64_file_name" >> $GITHUB_OUTPUT
echo "arm64_file_name=$_arm64_file_name" >> $GITHUB_OUTPUT
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Archive resources
run: ./github_pack_resources.sh | tee -a github_actions_retrieve_resources.log
- name: Upload resources
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ungoogled_chromium_macos_resources
path: upload_build_resources/
Expand Down Expand Up @@ -76,11 +76,11 @@ jobs:
id: bake
run: ./github_prepare_release.sh | tee -a github_actions_release.log
- name: Get built x86-64 binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ steps.bake.outputs.x64_file_name }}
- name: Get built arm64 binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ steps.bake.outputs.arm64_file_name }}
- name: List files
Expand Down
Loading