Skip to content

[pull] master from Hubs-Foundation:master #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jul 9, 2026
Merged

[pull] master from Hubs-Foundation:master #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fa1beb
Remove the last bits of Mozilla branding
Exairnous Jun 2, 2026
95eb2ef
Merge pull request #6587 from Exairnous/mozilla-branding-removal-2
DougReeder Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions habitat/plan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
pkg_name=hubs
pkg_origin=mozillareality
pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
pkg_origin=hubsfoundation
pkg_maintainer="Hubs Foundation <info@hubsfoundation.org>"

pkg_version="1.0.0"
pkg_license=('MPLv2')
pkg_description="Duck-powered web-based social VR."
pkg_upstream_url="https://hubs.mozilla.com/"
pkg_upstream_url="https://github.com/Hubs-Foundation/hubs"
pkg_build_deps=(
core/coreutils/8.32/20210826054709
core/bash/5.1/20210826055113
mozillareality/node16/16.16.0/20220729014143
core/node16/16.16.0/20220729014143
core/git/2.31.0/20211016175551
)

Expand Down
2 changes: 1 addition & 1 deletion scripts/hab-build-and-push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ touch /hab/svc/$pkg_name/var/deploying

rm -rf results
mkdir -p results
sudo /usr/bin/hab-docker-studio -k mozillareality run build
sudo /usr/bin/hab-docker-studio -k hubsfoundation run build
hab svc unload $PKG
sudo /usr/bin/hab-pkg-install results/*.hart
hab svc load $PKG
Expand Down
24 changes: 12 additions & 12 deletions scripts/hab-wrap-and-push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ dl="https://github.com/$org/$repo/releases/download/$ver/bio-${ver#"v"}-x86_64-l
echo "[info] getting bio from: $dl" && curl -L -o bio.gz $dl && tar -xf bio.gz
cp ./bio /usr/bin/bio && bio --version

export HAB_ORIGIN=mozillareality
export HAB_ORIGIN=hubsfoundation

mkdir -p /hab/cache/keys/
mkdir -p ./hab/cache/keys/
echo $BLDR_RET_PUB_B64 | base64 -d > /hab/cache/keys/mozillareality-20190117233449.pub
echo $BLDR_RET_PUB_B64 | base64 -d > ./hab/cache/keys/mozillareality-20190117233449.pub
echo $BLDR_HAB_PVT_B64 | base64 -d > /hab/cache/keys/mozillareality-20190117233449.sig.key
echo $BLDR_HAB_PVT_B64 | base64 -d > /hab/cache/keys/mozillareality-20190117233449.sig.key
echo $BLDR_RET_PUB_B64 | base64 -d > /hab/cache/keys/hubsfoundation-20190117233449.pub
echo $BLDR_RET_PUB_B64 | base64 -d > ./hab/cache/keys/hubsfoundation-20190117233449.pub
echo $BLDR_HAB_PVT_B64 | base64 -d > /hab/cache/keys/hubsfoundation-20190117233449.sig.key
echo $BLDR_HAB_PVT_B64 | base64 -d > /hab/cache/keys/hubsfoundation-20190117233449.sig.key

cd /repo && mkdir -p dist

Expand All @@ -41,16 +41,16 @@ export HAB_AUTH_TOKEN=$BLDR_HAB_TOKEN

cat > habitat/plan.sh << 'EOF'
pkg_name=hubs
pkg_origin=mozillareality
pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
pkg_origin=hubsfoundation
pkg_maintainer="Hubs Foundation <info@hubsfoundation.org>"
pkg_version="1.0.0"
pkg_license=('MPLv2')
pkg_description="Duck-powered web-based social VR."
pkg_upstream_url="https://hubs.mozilla.com/"
pkg_upstream_url="https://github.com/Hubs-Foundation/hubs"
pkg_build_deps=(
core/coreutils/8.32/20210826054709
core/bash/5.1/20210826055113
mozillareality/node16/16.16.0/20220729014143
core/node16/16.16.0/20220729014143
core/git/2.31.0/20211016175551
)
pkg_deps=(
Expand All @@ -69,13 +69,13 @@ do_install() {
}
EOF

bio pkg build -k mozillareality .
bio pkg build -k hubsfoundation .

### upload
echo "### upload hab pkg to bldr.reticulum.io"
export HAB_BLDR_URL="https://bldr.reticulum.io"
export HAB_AUTH_TOKEN=$BLDR_RET_TOKEN
echo $BLDR_RET_PUB_B64 | base64 -d > /hab/cache/keys/mozillareality-20190117233449.pub
hart="/hab/cache/artifacts/mozillareality-hubs*.hart"
echo $BLDR_RET_PUB_B64 | base64 -d > /hab/cache/keys/hubsfoundation-20190117233449.pub
hart="/hab/cache/artifacts/hubsfoundation-hubs*.hart"
ls -lha $hart
bio pkg upload $hart
2 changes: 1 addition & 1 deletion src/react-components/room/ObjectUrlModalContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function ObjectUrlModalContainer({ scene, onClose }) {
<ObjectUrlModal
isMobile={isMobile}
showModelCollectionLink={configs.feature("show_model_collection_link")}
modelCollectionUrl={configs.link("model_collection", "https://sketchfab.com/mozillareality")}
modelCollectionUrl={configs.link("model_collection", "https://sketchfab.com/<example-username>")}
onSubmit={onSubmit}
onClose={onClose}
/>
Expand Down
Loading