Skip to content

Commit

Permalink
Merge pull request #13 from elecordapp/build-dependencies
Browse files Browse the repository at this point in the history
Build dependencies fixes
  • Loading branch information
hazzuk authored Dec 18, 2024
2 parents 865b58c + fbe6b57 commit 6407be8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "element-web",
"name": "elecord-web",
"version": "1.11.87",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"description": "Privacy focused chat app for gamers",
"author": "hazzuk",
"repository": {
"type": "git",
"url": "https://github.com/element-hq/element-web"
"url": "https://github.com/elecordapp/elecord-web"
},
"license": "AGPL-3.0-only OR GPL-3.0-only",
"files": [
Expand Down
4 changes: 2 additions & 2 deletions scripts/fetchdep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ rm -r "$defrepo" || true
# figure out where to look for pull requests:
# - We may have been told an explicit repo via the PR_ORG/PR_REPO/PR_NUMBER env vars
# - otherwise, check the $GITHUB_ env vars which are set by Github Actions
# - failing that, fall back to the element-hq/element-web repo.
# - failing that, fall back to the elecordapp/elecord-web repo.
#
# in ether case, the PR_NUMBER variable must be set explicitly.
default_org_repo=${GITHUB_REPOSITORY:-"element-hq/element-web"}
default_org_repo=${GITHUB_REPOSITORY:-"elecordapp/elecord-web"}
PR_ORG=${PR_ORG:-${default_org_repo%%/*}}
PR_REPO=${PR_REPO:-${default_org_repo##*/}}

Expand Down
6 changes: 3 additions & 3 deletions scripts/layered.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ set -ex
yarn install --frozen-lockfile

# Pass appropriate repo to fetchdep.sh
export PR_ORG=element-hq
export PR_REPO=element-web
export PR_ORG=elecordapp
export PR_REPO=elecord-web

# Set up the js-sdk first
scripts/fetchdep.sh matrix-org matrix-js-sdk develop
scripts/fetchdep.sh elecordapp matrix-js-sdk develop
pushd matrix-js-sdk
[ -n "$JS_SDK_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $JS_SDK_GITHUB_BASE_REF && git checkout $JS_SDK_GITHUB_BASE_REF
yarn link
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/dialogs/ChangelogDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ interface Commit {
};
}

const REPOS = ["element-hq/element-web", "matrix-org/matrix-js-sdk"] as const;
const REPOS = ["elecordapp/elecord-web", "elecordapp/matrix-js-sdk"] as const;

export type DevelopVersionString = string & { _developVersionString: never };

Expand Down

0 comments on commit 6407be8

Please sign in to comment.