Skip to content

Commit f863af3

Browse files
committed
Merge branch 'master' into icosa-cleanup-2
# Conflicts: # lib/ret/media_search.ex # lib/ret_web/controllers/page_controller.ex
2 parents 8b41c5b + 7486f2f commit f863af3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+378
-216
lines changed

.githooks/pre-commit

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/bin/sh
2+
3+
# checks for filenames with non-ASCII characters
4+
if git rev-parse --verify HEAD >/dev/null 2>&1
5+
then
6+
against=HEAD
7+
else
8+
# Initial commit: diff against an empty tree object
9+
against=$(git hash-object -t tree /dev/null)
10+
fi
11+
12+
# If you want to allow non-ASCII filenames set this variable to true.
13+
allownonascii=$(git config --type=bool hooks.allownonascii)
14+
15+
# Redirect output to stderr.
16+
exec 1>&2
17+
18+
# Cross platform projects tend to avoid non-ASCII filenames; prevent
19+
# them from being added to the repository. We exploit the fact that the
20+
# printable range starts at the space character and ends with tilde.
21+
if [ "$allownonascii" != "true" ] &&
22+
# Note that the use of brackets around a tr range is ok here, (it's
23+
# even required, for portability to Solaris 10's /usr/bin/tr), since
24+
# the square bracket bytes happen to fall in the designated range.
25+
test $(git diff-index --cached --name-only --diff-filter=A -z $against |
26+
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
27+
then
28+
cat <<\EOF
29+
Error: Attempt to add a non-ASCII file name.
30+
31+
This can cause problems if you want to work with people on other platforms.
32+
33+
To be portable it is advisable to rename the file.
34+
35+
If you know what you are doing you can disable this check using:
36+
37+
git config hooks.allownonascii true
38+
EOF
39+
exit 1
40+
fi
41+
42+
# runs pseudo-lint on staged files
43+
git diff --name-only --cached | grep -E ".*\.(ex|exs)$" | xargs mix format --check-formatted
44+
45+
PSEUDOLINT_STATUS=$?
46+
if [ "$PSEUDOLINT_STATUS" != "0" ]; then
47+
echo 'run `mix format` then use `git add` to restage the formatted file'
48+
exit $PSEUDOLINT_STATUS
49+
fi

.github/workflows/hc-pkgcaller.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: hc-pkg
22
on:
3-
workflow_dispatch:
4-
3+
workflow_dispatch:
4+
55
jobs:
66
hcpkgrelease:
7-
uses: mozilla/hubs-ops/.github/workflows/HcPkgPreReleaseGitops.yaml@master
7+
uses: Hubs-Foundation/hubs-ops/.github/workflows/HcPkgPreReleaseGitops.yaml@master
88
with:
99
main: master
1010
releaseTrackingBranch: polycosm
11-
qaTestBranch: qa-test
11+
qaTestBranch: qa-test

.github/workflows/lint-and-test.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,17 @@ jobs:
8585
- elixir: '1.17'
8686
otp: '27.3'
8787

88+
- elixir: '1.18'
89+
otp: '25.1'
90+
- elixir: '1.18'
91+
otp: '28.0'
92+
8893
os:
8994
- 'ubuntu-22.04'
9095
- 'ubuntu-24.04'
9196

9297
exclude:
93-
- versions: # current
98+
- versions: # current versions; already tested above
9499
elixir: '1.16'
95100
otp: '25.3'
96101

@@ -142,23 +147,35 @@ jobs:
142147

143148

144149
pseudo-lint:
145-
continue-on-error: true # TODO: use `mix format` & check in files, then set this false
150+
continue-on-error: false # `mix format` MUST be run before committing
146151
strategy:
147152
fail-fast: false
148153
matrix:
149154
versions:
150-
- elixir: '1.14'
151-
otp: '24.3'
152-
153-
- elixir: '1.15'
154-
otp: '24.3'
155+
# - elixir: '1.14'
156+
# otp: '24.3'
157+
#
158+
# - elixir: '1.15'
159+
# otp: '24.3'
155160

156161
- elixir: '1.16'
157162
otp: '24.3'
158163

164+
# - elixir: '1.16'
165+
# otp: '25.1'
166+
159167
- elixir: '1.17'
160168
otp: '25.3'
161169

170+
# - elixir: '1.18'
171+
# otp: '25.1'
172+
173+
# - elixir: '1.17'
174+
# otp: '25.0'
175+
176+
- elixir: '1.18'
177+
otp: '28.0'
178+
162179
runs-on: 'ubuntu-24.04'
163180

164181
steps:

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
# Community Participation Guidelines
22

3-
This repository is governed by Mozilla's code of conduct and etiquette guidelines.
3+
This repository is governed by the Hubs Foundation's code of conduct and etiquette guidelines.
44
For more details, please read the
5-
[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/).
5+
[Hubs Community Participation Guidelines](https://github.com/Hubs-Foundation/hubs/blob/master/CODE_OF_CONDUCT.md).
66

77
## How to Report
8-
For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.
8+
For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://github.com/Hubs-Foundation/hubs/blob/master/CODE_OF_CONDUCT.md)' page.
99

10-
<!--
11-
## Project Specific Etiquette
12-
13-
In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
14-
Please update for your project.
15-
-->

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pipeline {
1717
stage('build') {
1818
steps {
1919
sh '''
20-
/usr/bin/script --return -c \\\\"sudo /usr/bin/hab-docker-studio -k mozillareality run /bin/bash scripts/build.sh\\\\" /dev/null
20+
/usr/bin/script --return -c \\\\"sudo /usr/bin/hab-docker-studio -k Hubs-Foundation run /bin/bash scripts/build.sh\\\\" /dev/null
2121
'''
2222

2323
sh 'sudo /usr/bin/hab-pkg-upload $(ls -t results/*.hart | head -n 1)'
@@ -58,9 +58,9 @@ pipeline {
5858
def text = (
5959
"*<http://localhost:8080/job/${jobName}/${buildNumber}|#${buildNumber}>* *${jobName}* " +
6060
"<https://bldr.habitat.sh/#/pkgs/${packageIdent}|${packageIdent}>\n" +
61-
"<https://github.com/mozilla/reticulum/commit/$gitSha|$gitSha> " +
61+
"<https://github.com/Hubs-Foundation/reticulum/commit/$gitSha|$gitSha> " +
6262
"Reticulum -> ${retPoolIcon} `${retPool}`: ```${gitSha} ${gitMessage}```\n" +
63-
"<https://smoke-hubs.mozilla.com/0zuesf6c6mf/smoke-test?required_ret_version=${retVersion}&required_ret_pool=${retPool}|Smoke Test> - to push:\n" +
63+
"<https://smoke-hubs.hubsfoundation.org/0zuesf6c6mf/smoke-test?required_ret_version=${retVersion}&required_ret_pool=${retPool}|Smoke Test> - to push:\n" +
6464
"`/mr ret deploy ${retVersion} ${retPool}`"
6565
)
6666
sendSlackMessage(text, "#mr-builds", ":gift:", slackURL);
@@ -73,7 +73,7 @@ pipeline {
7373
def text = (
7474
"*<http://localhost:8080/job/${jobName}/${buildNumber}|#${buildNumber}>* *${jobName}* " +
7575
"<https://bldr.reticulum.io/#/pkgs/${packageIdent}|${packageIdent}>\n" +
76-
"<https://github.com/mozilla/reticulum/commit/$gitSha|$gitSha> " +
76+
"<https://github.com/Hubs-Foundation/reticulum/commit/$gitSha|$gitSha> " +
7777
"${packageIdent} built and uploaded - to promote:\n" +
7878
"`/mr promote-ret-qa ${packageIdent}`"
7979
)

README.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Reticulum
2-
Note: **Due to our small team size, we don't support setting up Reticulum locally due to restrictions on developer credentials. Although relatively difficult and new territory, you're welcome to set up this up yourself. In addition to running Reticulum locally, you'll need to also run [Hubs](https://github.com/mozilla/hubs) and [Dialog](https://github.com/mozilla/dialog) locally because the developer Dialog server is locked down and your local Reticulum will not connect properly)**
2+
Note: **Due to our small team size, we don't support setting up Reticulum locally due to restrictions on developer credentials. Although relatively difficult and new territory, you're welcome to set up this up yourself. In addition to running Reticulum locally, you'll need to also run [Hubs](https://github.com/Hubs-Foundation/hubs) and [Dialog](https://github.com/Hubs-Foundation/dialog) locally because the developer Dialog server is locked down and your local Reticulum will not connect properly)**
33

4-
Reference [this discussion thread](https://github.com/mozilla/hubs/discussions/3323) for more information.
4+
Reference [this discussion thread](https://github.com/Hubs-Foundation/hubs/discussions/3323) for more information.
55

66
A hybrid game networking and web API server, focused on Social Mixed Reality.
77

@@ -37,7 +37,14 @@ https://hexdocs.pm/phoenix/installation.html
3737

3838
https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html
3939

40-
### 2. Setup Reticulum:
40+
### 2. Enable git hooks
41+
42+
Run
43+
```shell
44+
. scripts/setup.sh
45+
```
46+
47+
### 3. Setup Reticulum:
4148

4249
Run the following commands at the root of the reticulum directory:
4350

@@ -48,7 +55,7 @@ Run the following commands at the root of the reticulum directory:
4855
- If you receive an error that the `ret_dev` database does not exist, (using psql again) enter `create database ret_dev;`
4956
3. From the project directory `mkdir -p storage/dev`
5057

51-
### 3. Start Reticulum
58+
### 4. Start Reticulum
5259

5360
Run `scripts/run.sh` if you have the hubs secret repo cloned. Otherwise `iex -S mix phx.server`
5461

@@ -79,7 +86,7 @@ Example:
7986
Clone the Hubs repository and install the npm dependencies.
8087

8188
```bash
82-
git clone https://github.com/mozilla/hubs.git
89+
git clone https://github.com/Hubs-Foundation/hubs.git
8390
cd hubs
8491
npm ci
8592
```

bin/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
bin/
22
====
33
These scripts allow you to run common commands inside the
4-
[Hubs Compose](https://github.com/mozilla/hubs-compose) Reticulum container
4+
[Hubs Compose](https://github.com/Hubs-Foundation/hubs-compose) Reticulum container
55
from your own shell

config/dev.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ config :ret, RetWeb.Plugs.AddCSP,
156156
font_src: asset_hosts,
157157
style_src: asset_hosts,
158158
connect_src:
159-
"https://#{host}:8080 https://sentry.prod.mozaws.net #{asset_hosts} #{websocket_hosts} https://www.mozilla.org",
159+
"https://#{host}:8080 #{asset_hosts} #{websocket_hosts} https://hubsfoundation.org",
160160
img_src: asset_hosts,
161161
media_src: asset_hosts,
162162
manifest_src: asset_hosts
@@ -174,7 +174,7 @@ config :ret, Ret.Guardian,
174174
ttl: {12, :weeks}
175175

176176
config :web_push_encryption, :vapid_details,
177-
subject: "mailto:admin@mozilla.com",
177+
subject: "mailto:admin@hubsfoundation.org",
178178
public_key:
179179
"BAb03820kHYuqIvtP6QuCKZRshvv_zp5eDtqkuwCUAxASBZMQbFZXzv8kjYOuLGF16A3k8qYnIN10_4asB-Aw7w",
180180
# This config value is for local development only.

config/test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ config :sentry,
5151

5252
config :ret, Ret.Repo.Migrations.AdminSchemaInit, postgrest_password: "password"
5353
config :ret, Ret.Locking, lock_timeout_ms: 1000 * 60 * 15
54-
config :ret, Ret.Account, admin_email: "admin@mozilla.com"
54+
config :ret, Ret.Account, admin_email: "admin@hubsfoundation.org"
5555

5656
config :ret, RetWeb.HubChannel, enable_terminate_actions: false
5757

habitat/plan.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
pkg_name=reticulum
2-
pkg_origin=mozillareality
2+
pkg_origin=hubsfoundation
33
pkg_version="1.0.1"
4-
pkg_maintainer="Mozilla Mixed Reality <mixreality@mozilla.com>"
5-
pkg_upstream_url="http://github.com/mozilla/reticulum"
4+
pkg_maintainer="Hubs Foundation <info@hubsfoundation.org>"
5+
pkg_upstream_url="http://github.com/Hubs-Foundation/reticulum"
66
pkg_license=('MPL-2.0')
77
pkg_deps=(
88
core/coreutils/8.30/20190115012313
@@ -12,8 +12,8 @@ pkg_deps=(
1212
pkg_build_deps=(
1313
core/coreutils/8.30/20190115012313
1414
core/git/2.23.0
15-
mozillareality/erlang/23.3.4.18
16-
mozillareality/elixir/1.14.3
15+
hubsfoundation/erlang/23.3.4.18
16+
hubsfoundation/elixir/1.14.3
1717
)
1818
pkg_exports=(
1919
[port]=phx.port

0 commit comments

Comments
 (0)