Merge pull request #1382 from element-hq/backport-1375-to-staging

Backport 1375 to staging
element-hq · Dec 13, 2023 · d194fbc · d194fbc
2 parents 79c4b6f + 788a4ca
commit d194fbc
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1 +1 @@
-_extends: vector-im/element-web
+_extends: element-hq/element-web
diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml
@@ -142,7 +142,7 @@ jobs:
               uses: peter-evans/repository-dispatch@bf47d102fdb849e755b0b0023ea3e81a44b6f570 # v2
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  repository: vector-im/packages.element.io
+                  repository: element-hq/packages.element.io
                   event-type: packages-index
 
             - name: Find debs
@@ -155,7 +155,7 @@ jobs:
                   done
 
             - name: Publish amd64 deb to packages.element.io
-              uses: vector-im/packages.element.io@master
+              uses: element-hq/packages.element.io@master
               if: needs.linux.result == 'success'
               with:
                   file: ${{ steps.deb.outputs.amd64 }}
@@ -165,7 +165,7 @@ jobs:
                   bucket-access-key: ${{ secrets.CF_R2_TOKEN }}
 
             - name: Publish arm64 deb to packages.element.io
-              uses: vector-im/packages.element.io@master
+              uses: element-hq/packages.element.io@master
               if: needs.linux.result == 'success'
               with:
                   file: ${{ steps.deb.outputs.arm64 }}

diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml
@@ -27,12 +27,12 @@ on:
             docker-image:
                 type: string
                 required: false
-                description: "The docker image to use for the build, defaults to ghcr.io/vector-im/element-desktop-dockerbuild"
+                description: "The docker image to use for the build, defaults to ghcr.io/element-hq/element-desktop-dockerbuild"
 jobs:
     build:
         runs-on: ubuntu-latest
         container:
-            image: ${{ inputs.docker-image || format('ghcr.io/vector-im/element-desktop-dockerbuild:{0}', github.ref_name == 'master' && 'master' || 'develop') }}
+            image: ${{ inputs.docker-image || format('ghcr.io/element-hq/element-desktop-dockerbuild:{0}', github.ref_name == 'master' && 'master' || 'develop') }}
         defaults:
             run:
                 shell: bash

diff --git a/.github/workflows/build_prepare.yaml b/.github/workflows/build_prepare.yaml
@@ -124,7 +124,7 @@ jobs:
                   echo "| Component   | Version |" >> $GITHUB_STEP_SUMMARY
                   echo "| ----------- | ------- |" >> $GITHUB_STEP_SUMMARY
                   echo "| Bundle Hash | $BUNDLE_HASH |" >> $GITHUB_STEP_SUMMARY
-                  echo "| Element Web | [$WEB_VERSION](https://github.com/vector-im/element-web/commit/$WEB_VERSION) |" >> $GITHUB_STEP_SUMMARY
+                  echo "| Element Web | [$WEB_VERSION](https://github.com/element-hq/element-web/commit/$WEB_VERSION) |" >> $GITHUB_STEP_SUMMARY
                   echo "| React SDK   | [$REACT_VERSION](https://github.com/matrix-org/matrix-react-sdk/commit/$REACT_VERSION) |" >> $GITHUB_STEP_SUMMARY
                   echo "| JS SDK      | [$JS_VERSION](https://github.com/matrix-org/matrix-js-sdk/commit/$JS_VERSION) |" >> $GITHUB_STEP_SUMMARY
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,6 +20,6 @@ jobs:
             GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         with:
             final: ${{ inputs.mode == 'final' }}
-            include-changes: vector-im/element-web@$VERSION
+            include-changes: element-hq/element-web@$VERSION
             gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
             expected-asset-count: 1
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
@@ -10,10 +10,10 @@ on:
             - .github/labels.yml
 jobs:
     sync-labels:
-        uses: vector-im/element-meta/.github/workflows/sync-labels.yml@develop
+        uses: element-hq/element-meta/.github/workflows/sync-labels.yml@develop
         with:
             LABELS: |
-                vector-im/element-web
+                element-hq/element-web
                 .github/labels.yml
             DELETE: true
             WET: true

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
@@ -6,5 +6,5 @@ on:
 
 jobs:
     call-triage-labelled:
-        uses: vector-im/element-web/.github/workflows/triage-labelled.yml@develop
+        uses: element-hq/element-web/.github/workflows/triage-labelled.yml@develop
         secrets: inherit
diff --git a/scripts/fetch-package.ts b/scripts/fetch-package.ts
@@ -12,7 +12,7 @@ import riotDesktopPackageJson from "../package.json";
 import { setPackageVersion } from "./set-version";
 
 const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
-const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
+const PACKAGE_URL_PREFIX = "https://github.com/element-hq/element-web/releases/download/";
 const DEVELOP_TGZ_URL = "https://develop.element.io/develop.tar.gz";
 const ASAR_PATH = "webapp.asar";