Desktop to Firefox 157.0 (LibreWolf 157.0-1); Android stays on 153.0esr

.forgejo/workflows/source-release.yaml

@@ -7,7 +7,7 @@ jobs:
   build-source:
     runs-on: epsilon
     container:
-      image: codeberg.org/librewolf/bsys6:dind
+      image: librewolf.dev/librewolf/bsys6:dind
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v6
@@ -36,7 +36,7 @@ jobs:
     runs-on: epsilon
     if: forgejo.ref == 'refs/heads/main'
     container:
-      image: codeberg.org/librewolf/bsys6:dind
+      image: librewolf.dev/librewolf/bsys6:release
     needs: [build-source]
     steps:
       - name: Checkout Repository
@@ -79,6 +79,50 @@ jobs:
             curl --http1.1 --user "${{ vars.FORGE_USER }}:${{ secrets.FORGE_TOKEN }}" --upload-file "${FILE}" "${{ forgejo.server_url }}/api/packages/${{ forgejo.repository_owner }}/generic/librewolf-source/${{ steps.version.outputs.VERSION }}-${{ steps.version.outputs.RELEASE }}/${FILE}" >&2
           done
 
+      - name: Upload to S3
+        env:
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          S3_ENDPOINT: ${{ vars.S3_ENDPOINT }}
+          S3_BUCKET: ${{ vars.S3_BUCKET }}
+          S3_KEY: ${{ secrets.S3_KEY }}
+          S3_SECRET: ${{ secrets.S3_SECRET }}
+          S3_PUBLIC_URL: ${{ vars.S3_PUBLIC_URL }}
+        run: |
+          for required_var in S3_ENDPOINT S3_BUCKET S3_KEY S3_SECRET S3_PUBLIC_URL; do
+            if [ -z "${!required_var:-}" ]; then
+              echo "Error: '$required_var' is not set" >&2
+              exit 1
+            fi
+          done
+
+          TAG="${{ steps.version.outputs.VERSION }}-${{ steps.version.outputs.RELEASE }}"
+
+          FILES=(
+            "librewolf-${TAG}.source.tar.gz"
+            "librewolf-${TAG}.source.tar.gz.sha256sum"
+            "librewolf-${TAG}.source.tar.gz.sha512sum"
+          )
+
+          if [[ -n "$SIGNING_KEY" ]]; then
+            FILES+=("librewolf-${TAG}.source.tar.gz.sig")
+          fi
+
+          for FILE in "${FILES[@]}"; do
+            S3_PATH="/librewolf-source/${TAG}/${FILE}"
+            echo "-> Uploading ${FILE} to S3" >&2
+            if ! s3cmd put "${FILE}" "s3://${S3_BUCKET}${S3_PATH}" \
+              --access_key="$S3_KEY" \
+              --secret_key="$S3_SECRET" \
+              --host="$S3_ENDPOINT" \
+              --host-bucket="$S3_ENDPOINT" \
+              --guess-mime-type \
+              --no-mime-magic >&2; then
+              echo "Error: Failed to upload ${FILE} to S3" >&2
+              exit 1
+            fi
+            echo "${S3_PUBLIC_URL}${S3_PATH}"
+          done
+
       - name: Create Release
         env:
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
@@ -90,7 +134,7 @@ jobs:
           body=$(jq -n \
             --arg tag "$TAG" \
             --arg name "LibreWolf Source v${TAG}" \
-            --arg body $'## LibreWolf Source Release v'"${TAG}"$'\n\nBuilt on Codeberg by workflow [#${{ forgejo.run_number }}](${{ forgejo.server_url }}/${{ forgejo.repository }}/actions/runs/${{ forgejo.run_number }})' \
+            --arg body $'## LibreWolf Source Release v'"${TAG}"$'\n\nBuilt by workflow [#${{ forgejo.run_number }}](${{ forgejo.server_url }}/${{ forgejo.repository }}/actions/runs/${{ forgejo.run_number }})' \
             '{tag_name: $tag, name: $name, body: $body, draft: false, prerelease: false}')
 
           release_id=$(curl --fail-with-body --header 'Content-Type: application/json' \

.forgejo/workflows/source-test.yaml

@@ -37,7 +37,7 @@ jobs:
     if: ${{ !(forgejo.event_name == 'pull_request' && forgejo.head_ref == 'beta' && forgejo.base_ref == 'main') }}
     runs-on: epsilon
     container:
-      image: codeberg.org/librewolf/bsys6:dind
+      image: librewolf.dev/librewolf/bsys6:dind
     outputs:
       ff_version: ${{ steps.detect.outputs.FF_VERSION }}
       ff_channel: ${{ steps.detect.outputs.FF_CHANNEL }}
@@ -76,7 +76,7 @@ jobs:
     if: inputs.Target == 'all' || inputs.Target == 'linux' || inputs.Target == ''
     runs-on: epsilon
     container:
-      image: codeberg.org/librewolf/bsys6:linux
+      image: librewolf.dev/librewolf/bsys6:linux
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v6
@@ -108,7 +108,7 @@ jobs:
     if: inputs.Target == 'all' || inputs.Target == 'windows'
     runs-on: epsilon
     container:
-      image: codeberg.org/librewolf/bsys6:windows
+      image: librewolf.dev/librewolf/bsys6:windows
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v6
@@ -140,7 +140,7 @@ jobs:
     if: inputs.Target == 'all' || inputs.Target == 'macos'
     runs-on: epsilon
     container:
-      image: codeberg.org/librewolf/bsys6:macos
+      image: librewolf.dev/librewolf/bsys6:macos
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v6

README.md

@@ -53,8 +53,8 @@ These are the locations where people have their repositories and build artifacts
 
 Active:
 
-- [Arch](https://codeberg.org/librewolf/arch) - Arch Linux package
-- [BSYS6](https://codeberg.org/librewolf/bsys6) - Linux Mint, Fedora,
+- [Arch](https://archlinux.org/packages/extra/x86_64/librewolf/) - Arch Linux package
+- [BSYS6](https://librewolf.dev/librewolf/bsys6) - Linux Mint, Fedora,
   Ubuntu, MacOS, portable and setup for Windows
 - [Gentoo](https://codeberg.org/librewolf/gentoo) - Gentoo GNU/Linux package
 
@@ -77,8 +77,8 @@ or compile directly with this repository.
 
 ### Build: Tarball
 
-1. Let's **[download the latest tarball](https://codeberg.org/librewolf/source/releases)**.
-   This tarball is the latest produced by the [CI](https://codeberg.org/librewolf/source/actions?workflow=source-release.yaml).
+1. Let's **[download the latest tarball](https://librewolf.dev/librewolf/source/releases)**.
+   This tarball is the latest produced by the [CI](https://librewolf.dev/librewolf/source/actions?workflow=source-release.yaml).
    You can also check the `sha256sum` of the tarball there:
 
    ```bash
@@ -115,7 +115,7 @@ or compile directly with this repository.
 1. Clone this repository with Git:
 
    ```bash
-   git clone --recursive git@codeberg.org:librewolf/source.git librewolf-source --depth=1 && cd librewolf-source
+   git clone --recursive git@librewolf.dev:librewolf/source.git librewolf-source --depth=1 && cd librewolf-source
    ```
 
 2. Build LibreWolf source code,

assets/Dockerfile

@@ -11,7 +11,7 @@ RUN ( dnf -y upgrade && dnf -y install python3 python3-devel wget rpm-build rpm-
 # Grab the latest source cleanly
 WORKDIR /
 RUN rm -rf /source
-RUN git clone --recursive https://codeberg.org/librewolf/source.git
+RUN git clone --recursive https://librewolf.dev/librewolf/source.git
 WORKDIR /source
 
 RUN make check && make setup-debian && make fetch && make bootstrap && make build package && make veryclean

assets/mozconfig.android

@@ -685,6 +685,19 @@ ac_add_options --with-l10n-base="$topsrcdir/lw/l10n"
 #    -> KEPT verbatim, but see the note above: they are make-level only and
 #       never reach configure.  This is true on desktop too.
 #
+# 6. export MOZ_PKG_VERSION=
+#    -> DESKTOP-ONLY, not carried.  Added by the Firefox 157 desktop merge
+#       (upstream LibreWolf 157): an empty placeholder in the desktop template
+#       that scripts/librewolf-patches.py (write_desktop_mozconfig) fills with
+#       <version>-<release> on a desktop-only run, so the desktop package
+#       names carry LibreWolf's display version now that browser/config/
+#       version.txt holds the bare Firefox version.  It only names packaging
+#       artifacts (toolkit/mozapps/installer/package-name.mk).  Android is
+#       untouched by it: version.txt still holds <version>-<release> on an
+#       android run, the APK is named by Gradle, not package-name.mk, and an
+#       android run copies the template unchanged (install_mozconfig) exactly
+#       as before the merge.
+#
 # Android-only additions that have no desktop counterpart:
 #   --target=aarch64-linux-android, --enable-appservices-in-tree,
 #   --with-android-sdk / --with-android-ndk / --with-java-bin-path /

assets/mozconfig.new

@@ -25,6 +25,7 @@ export MOZ_TELEMETRY_REPORTING=
 export MOZ_REQUIRE_SIGNING=
 export MOZILLA_OFFICIAL=1
 export MOZ_APP_REMOTINGNAME=LibreWolf
+export MOZ_PKG_VERSION=
 
 mk_add_options MOZ_CRASHREPORTER=0
 mk_add_options MOZ_DATA_REPORTING=0