fix build and release

.gitea/workflows/release/build-and-release.yaml

@@ -6,51 +6,31 @@ on:
       - v**
 
 jobs:
-  webext-build:
-    runs-on: ubuntu-latest
-    container:
-      image: node:24
-    steps:
-      - name: Checkout repository
-        uses: https://github.com/actions/checkout@v4
-      - name: Install dependencies
-        run: cd web-extension/cl && npm install
-      - name: Build and sign web extension
-        env:
-          AMO_API_KEY: ${{ secrets.AMO_API_KEY }}
-          AMO_API_SECRET: ${{ secrets.AMO_API_SECRET }}
-        run: cd web-extension/cl && npm run sign
-      - name: Upload web extension artifact
-        uses: https://github.com/actions/upload-artifact@v3
-        with:
-          name: webext-xpi
-          path: web-extension/cl/web-ext-artifacts/*.xpi
-          retention-days: 7
-          if-no-files-found: error
-
   build-and-release:
     runs-on: ubuntu-latest
-    needs: [webext-build]
     steps:
       - name: Checkout repository
         uses: https://github.com/actions/checkout@v4
       - name: Install rust toolchain
         uses: https://github.com/dtolnay/rust-toolchain@stable
+      - name: Build binaries
+        run: cargo build --quiet --release
       - name: Install cargo-deb
         run: cargo install --quiet cargo-deb
       - name: Build Debian package
-        run: cargo deb --quiet
+        run: cargo deb
       - name: Upload Debian package to Gitea registry
         env:
-          GITEA_OWNER: ${{ vars.PUBLISH_USERNAME }}
+          GITEA_OWNER: ${{ github.repository_owner }}
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
           GITEA_SERVER_URL: ${{ github.server_url }}
-          GITEA_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
           DEB_DISTRIBUTIONS: noble,plucky,questing
           DEB_COMPONENT: main
           DEB_ARCH: amd64
         run: |
           set -euo pipefail
           DEB_FILE=$(ls target/debian/*.deb | head -n1)
+          env
           if [ -z "${DEB_FILE}" ]; then
             echo "No .deb file found in target/debian" >&2
             exit 1
@@ -64,11 +44,11 @@ jobs:
               --upload-file "${DEB_FILE}" \
               "${GITEA_SERVER_URL}/api/packages/${GITEA_OWNER}/debian/pool/${DISTRO}/main/upload"
           done
-      - name: Download web extension artifact
+      - name: Read release content
-        uses: https://github.com/actions/download-artifact@v3
+        uses: https://github.com/jaywcjlove/github-action-read-file@main
+        id: read_release
         with:
-          name: webext-xpi
+          path: .changes/${{ github.ref_name }}.md
-          path: web-extension/cl/web-ext-artifacts
       - name: Release
         uses: https://gitea.com/akkuman/gitea-release-action@v1
         env:
@@ -76,9 +56,6 @@ jobs:
         with:
           files: |-
             config.toml.dist
-            web-extension/cl/web-ext-artifacts/*.xpi
           md5sum: true
           sha256sum: true
-          body: Test release
+          body_path: .changes/${{ github.ref_name }}.md
-          prerelease: true
-          #body_path: .changes/${{ github.ref_name }}.md

Cargo.lock

@@ -174,7 +174,7 @@ dependencies = [
 
 [[package]]
 name = "cl-cli"
-version = "0.5.0-alpha12"
+version = "0.4.1"
 dependencies = [
  "clap",
  "gitlab",

Cargo.toml

@@ -1,9 +1,7 @@
 [package]
 name = "cl-cli"
-version = "0.5.0-alpha12"
+version = "0.4.1"
 edition = "2021"
-license = "GPLv3"
-description = "Some helpers scripts for Champs-Libres"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -18,7 +16,7 @@ path="src/webext.rs"
 [dependencies]
 clap = { version = "4.1.13", features = ["derive"] }
 gitlab = "0.1804.0"
-reqwest = { version = "0.12.24", features = ["rustls-tls"] }
+reqwest = "0.12.24"
 serde = { version = "1.0.228", features = ["derive"] }
 toml = "0.9.8"
 url = "2.5.7"

web-extension/cl/.web-extension-id

@@ -1,3 +0,0 @@
-# This file was created by https://github.com/mozilla/web-ext
-# Your auto-generated extension ID for addons.mozilla.org is:
-helper@champs-libres-coop

web-extension/cl/manifest.json

@@ -5,10 +5,7 @@
   "browser_specific_settings": {
     "gecko": {
       "id": "helper@champs-libres-coop",
-      "strict_min_version": "143.0",
+      "strict_min_version": "143.0"
-      "data_collection_permissions": {
-        "required": ["none"]
-      }
     }
   },
 

web-extension/cl/package.json

@@ -7,8 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "check": "tsc --noEmit",
     "build": "tsc",
-    "package": "tsc && web-ext build --overwrite-dest",
+    "package": "tsc && web-ext build --overwrite-dest"
-    "sign": "tsc && web-ext build --overwrite-dest && web-ext sign --use-submission-api --api-key $AMO_API_KEY --api-secret $AMO_API_SECRET --channel unlisted"
   },
   "keywords": [],
   "author": "",