fix

.gitlab-ci.yml

@@ -1,239 +1,22 @@
-stages:
-  - images
-  - build
-  - release
-  - deploy
-
-Build Docker Images:
-  stage: images
-  when: manual
-  only:
-    - master
-  image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
-  # Needed because we aren't using our custom runners here
-  services:
-    - docker:dind
-  variables:
-    DOCKER_HOST: tcp://docker:2375
-  parallel:
-    matrix:
-      - DISTRO:
-          - debian11
-          - ubuntu20
-          - ubuntu22
-          - mint20
-          - mint21
-          - fedora37
-          - fedora36
-          - macos-x86_64
-          - macos-aarch64
-          - dind
-  script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
-    - make docker-$DISTRO
-    - docker push registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
-
 Build:
   stage: build
   when: manual
   allow_failure: false
-  parallel:
+  image: registry.gitlab.com/librewolf-community/browser/bsys5/debian11
-    matrix:
-      - DISTRO:
-          - debian11
-          - ubuntu20
-          - ubuntu22
-          - mint20
-          - mint21
-          - fedora37
-          - fedora36
-          - macos-x86_64
-          - macos-aarch64
-  image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags:
     - autoscale
   except:
     - merge_requests
   script:
-    - make $DISTRO
+    - |
-    - echo VERSION=$(cat version) >> variables.env
+      cd ~
-    - echo RELEASE=$(cat release) >> variables.env
+      wget https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$(cat version)-$(cat source_release)/librewolf-$(cat version)-$(cat source_release).source.tar.gz
-    - echo SOURCE_RELEASE=$(cat source_release) >> variables.env
+      tar xf librewolf-$(cat version)-$(cat source_release).source.tar.gz
-    - "t=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
+      cd librewolf-$(cat version)-$(cat source_release)
+      echo 'ac_add_options --target=i686-linux-gnu' >>mozbuild
+      ./mach build
+      ./mach package
+      mv work/librewolf-$(cat version)-$(cat source_release)/obj-i686-pc-linux-gnu/dist/librewolf-$(cat version)-$(cat source_release).en-US.linux-i686.tar.bz2 .
   artifacts:
     paths:
-      - librewolf-*.deb
+      - librewolf-*.tar.bz2
-      - librewolf-*.deb.sha256sum
-      - librewolf-*.rpm
-      - librewolf-*.rpm.sha256sum
-      - librewolf-*.dmg
-      - librewolf-*.dmg.sha256sum
-    reports:
-      dotenv: variables.env
-
-Release:
-  stage: release
-  when: manual
-  allow_failure: false
-  image: ubuntu
-  needs:
-    - job: "Build"
-      artifacts: true
-  only:
-    - master
-  except:
-    - merge_requests
-  before_script:
-    - apt-get update
-    - apt-get install -y curl
-    - curl -L --output /usr/local/bin/release-cli "https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
-    - chmod +x /usr/local/bin/release-cli
-  script:
-    - |
-      codeberg_release_body=""
-      function upload_package() {
-        curl \
-          --header "JOB-TOKEN: $CI_JOB_TOKEN" \
-          --upload-file "$1" \
-          "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/$1"
-        codeberg_release_body="${codeberg_release_body}[$1]($CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/$1)\n"
-      }
-      upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb
-      upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
-      upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
-      upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum
-      upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb
-      upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb.sha256sum
-      upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb
-      upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum
-      upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb
-      upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
-      upload_package librewolf-$FILEVER.fc37.x86_64.rpm
-      upload_package librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
-      upload_package librewolf-$FILEVER.fc36.x86_64.rpm
-      upload_package librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
-      upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg
-      upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
-      upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg
-      upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum
-      curl -X 'POST' \
-        "https://codeberg.org/api/v1/repos/librewolf/bsys5/releases?token=$CODEBERG_TOKEN" \
-        -H 'accept: application/json' \
-        -H 'Content-Type: application/json' \
-        -d "{
-        \"name\": \"$FILEVER\",
-        \"tag_name\": \"$FILEVER\",
-        \"body\": \"$codeberg_release_body\"
-      }"
-  release:
-    tag_name: "$FILEVER"
-    description: "## LibreWolf bsys5 Release v$FILEVER\n\n- \n\n(Built on GitLab by pipeline [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))"
-    assets:
-      links:
-        - name: Debian 11 (deb)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb
-        - name: Debian 11 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
-        - name: Ubuntu 20 (deb)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
-        - name: Ubuntu 20 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum
-        - name: Ubuntu 22 (deb)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb
-        - name: Ubuntu 22 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb.sha256sum
-        - name: Linux Mint 20 (deb)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb
-        - name: Linux Mint 20 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum
-        - name: Linux Mint 21 (deb)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb
-        - name: Linux Mint 21 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
-        - name: Fedora 37 (rpm)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm
-        - name: Fedora 37 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
-        - name: Fedora 36 (rpm)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm
-        - name: Fedora 36 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
-        - name: macOS x86_64 (dmg)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg
-        - name: macOS x86_64 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
-        - name: macOS aarch64 (dmg)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg
-        - name: macOS aarch64 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum
-
-Update Repositories:
-  stage: deploy
-  only:
-    - master
-  except:
-    - merge_requests
-  image: curlimages/curl
-  script:
-    - |
-      #
-      FILEVER=$(cat version)-$(cat source_release) ; grep -q 1 release ; if [ ! $? ]; then FILEVER=$(cat version)-$(cat source_release)-$(cat release); fi
-
-      body=$(cat <<EOF
-      {
-        "token": "$REPO_DEPLOY_TOKEN",
-        "debs": [
-          {
-            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb",
-            "distros": ["bullseye"]
-          },
-          {
-            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb",
-            "distros": ["focal"]
-          },
-          {
-            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb",
-            "distros": ["jammy"]
-          },
-          {
-            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb",
-            "distros": ["uma", "una"]
-          },
-          {
-            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb",
-            "distros": ["vanessa", "vera"]
-          }
-        ],
-        "rpms": [
-          {
-            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm"
-          },
-          {
-            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm"
-          }
-        ]
-      }
-      EOF
-      )
-
-      id=$(curl "https://updaterepos.librewolf.net/job" --request POST --data "$body")
-
-      echo "Submitted update request to LibreWolf Software Repository (https://updaterepos.librewolf.net/job?id=$id)"