Compare commits

..

No commits in common. "master" and "wip-deploy-using-librepages" have entirely different histories.

5 changed files with 6 additions and 9 deletions

View file

@ -9,10 +9,10 @@ pipeline:
- yarn build - yarn build
deploy: deploy:
image: python image: node:16
when: when:
event: push event: push
branch: master branch: master
commands: commands:
- make ci-deploy - make ci-deploy
secrets: [ GITEA_WRITE_DEPLOY_KEY, LIBREPAGES_DEPLOY_SECRET ] secrets: [ gitea_write_deploy_key, librepages_deploy_secret ]

View file

@ -6,8 +6,8 @@ ci-deploy: ## Deploy from CI/CD. Only call from within CI
git config --global user.email "${CI_COMMIT_AUTHOR_EMAIL}" git config --global user.email "${CI_COMMIT_AUTHOR_EMAIL}"
git config --global user.name "${CI_COMMIT_AUTHOR}" git config --global user.name "${CI_COMMIT_AUTHOR}"
./scripts/ci.sh --commit-files librepages target "${CI_COMMIT_AUTHOR} <${CI_COMMIT_AUTHOR_EMAIL}>" ./scripts/ci.sh --commit-files librepages target "${CI_COMMIT_AUTHOR} <${CI_COMMIT_AUTHOR_EMAIL}>"
./scripts/ci.sh --init "$$GITEA_WRITE_DEPLOY_KEY" ./scripts/ci.sh --init "$$gitea_write_deploy_key"
./scripts/ci.sh --deploy ${LIBREPAGES_DEPLOY_SECRET} librepages ./scripts/ci.sh --deploy ${librepages_deploy_secret} librepages
./scripts/ci.sh --clean ./scripts/ci.sh --clean
help: ## Prints help for targets with comments help: ## Prints help for targets with comments

View file

@ -1,5 +1,3 @@
[![status-badge](https://ci.batsense.net/api/badges/mystiq/hydrogen-web/status.svg)](https://ci.batsense.net/mystiq/hydrogen-web)
# Hydrogen # Hydrogen
A minimal [Matrix](https://matrix.org/) chat client, focused on performance, offline functionality, and broad browser support. This is work in progress and not yet ready for primetime. Bug reports are welcome, but please don't file any feature requests or other missing things to be on par with Element Web. A minimal [Matrix](https://matrix.org/) chat client, focused on performance, offline functionality, and broad browser support. This is work in progress and not yet ready for primetime. Bug reports are welcome, but please don't file any feature requests or other missing things to be on par with Element Web.

View file

@ -20,7 +20,6 @@ set -xEeuo pipefail
readonly SSH_ID_FILE=/tmp/ci-ssh-id readonly SSH_ID_FILE=/tmp/ci-ssh-id
readonly SSH_REMOTE_NAME=origin-ssh readonly SSH_REMOTE_NAME=origin-ssh
readonly PROJECT_ROOT=$(pwd)
match_arg() { match_arg() {
if [ $1 == $2 ] || [ $1 == $3 ] if [ $1 == $2 ] || [ $1 == $3 ]

View file

@ -4,6 +4,6 @@
"gatewayUrl": "https://matrix.org", "gatewayUrl": "https://matrix.org",
"applicationServerKey": "BC-gpSdVHEXhvHSHS0AzzWrQoukv2BE7KzpoPO_FfPacqOo3l1pdqz7rSgmB04pZCWaHPz7XRe6fjLaC-WPDopM" "applicationServerKey": "BC-gpSdVHEXhvHSHS0AzzWrQoukv2BE7KzpoPO_FfPacqOo3l1pdqz7rSgmB04pZCWaHPz7XRe6fjLaC-WPDopM"
}, },
"defaultHomeServer": "matrix.test.mystiq.app", "defaultHomeServer": "matrix.org",
"bugReportEndpointUrl": "https://rageshake.test.mystiq.app/api/submit" "bugReportEndpointUrl": "https://element.io/bugreports/submit"
} }