Skip to content

Commit

Permalink
Merge pull request #951 from loki-project/clearnet
Browse files Browse the repository at this point in the history
Merge into Master; prep for v1.0.3
  • Loading branch information
Mikunj committed Mar 5, 2020
2 parents 50280a9 + 1996795 commit f0bb328
Show file tree
Hide file tree
Showing 129 changed files with 2,055 additions and 2,460 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ jobs:

- name: Build mac production binaries
if: runner.os == 'macOS'
run: $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion=${{ github.ref }} --publish=never --config.directories.output=release
run: |
source ./build/setup-mac-certificate.sh
$(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion=${{ github.ref }} --publish=never --config.directories.output=release
env:
CSC_LINK: ${{ secrets.MAC_CERTIFICATE }}
CSC_KEY_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE }}
MAC_CERTIFICATE_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
SIGNING_APPLE_ID: ${{ secrets.SIGNING_APPLE_ID }}
SIGNING_APP_PASSWORD: ${{ secrets.SIGNING_APP_PASSWORD }}
SIGNING_TEAM_ID: ${{ secrets.SIGNING_TEAM_ID }}
Expand Down
67 changes: 67 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# This script will run tests anytime a pull request is added
name: Session Test

on:
pull_request:
branches:
- development
- clearnet
- github-actions

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-2016, macos-latest, ubuntu-latest]
env:
SIGNAL_ENV: production
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- run: git config --global core.autocrlf false

- name: Checkout git repo
uses: actions/checkout@v1

- name: Install node
uses: actions/setup-node@v1
with:
node-version: 10.13.0

- name: Setup node for windows
if: runner.os == 'Windows'
run: |
npm install --global --production windows-build-tools@4.0.0
npm install --global node-gyp@latest
npm config set python python2.7
npm config set msvs_version 2015
- name: Install yarn
run: npm install yarn --no-save

- name: Install Dependencies
run: yarn install --frozen-lockfile

- name: Generate and concat files
run: yarn generate

- name: Lint Files
run: |
yarn format-full --list-different
yarn eslint
yarn tslint
- name: Make linux use en_US locale
if: runner.os == 'Linux'
run: |
sudo apt-get install -y hunspell-en-us
sudo locale-gen en_US.UTF-8
sudo dpkg-reconfigure locales
echo ::set-env name=DISPLAY:::9.0
echo ::set-env name=LANG::en_US.UTF-8
- name: Test
uses: GabrielBB/xvfb-action@v1.0
with:
run: yarn test
8 changes: 5 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@ jobs:

- name: Build mac production binaries
if: runner.os == 'macOS'
run: $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion=${{ github.ref }} --publish=always
run: |
source ./build/setup-mac-certificate.sh
$(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion=${{ github.ref }} --publish=always
env:
CSC_LINK: ${{ secrets.MAC_CERTIFICATE }}
CSC_KEY_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE }}
MAC_CERTIFICATE_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
SIGNING_APPLE_ID: ${{ secrets.SIGNING_APPLE_ID }}
SIGNING_APP_PASSWORD: ${{ secrets.SIGNING_APP_PASSWORD }}
SIGNING_TEAM_ID: ${{ secrets.SIGNING_TEAM_ID }}
Expand Down
61 changes: 0 additions & 61 deletions .gitlab-ci.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .travis.yml

This file was deleted.

10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ for it or creating a new one yourself. You can use also that issue as a place to
your intentions and get feedback from the users most likely to appreciate your changes.

You're most likely to have your pull request accepted easily if it addresses bugs already
in the [Next Steps project](https://github.com/loki-project/loki-messenger/projects/1),
in the [Next Steps project](https://github.com/loki-project/session-desktop/projects/1),
especially if they are near the top of the Backlog column. Those are what we'll be looking
at next, so it would be great if you helped us out!

Expand All @@ -22,7 +22,7 @@ ounce of prevention, as they say!](https://www.goodreads.com/quotes/247269-an-ou
## Developer Setup

First, you'll need [Node.js](https://nodejs.org/) which matches our current version.
You can check [`.nvmrc` in the `development` branch](https://github.com/loki-project/loki-messenger/blob/development/.nvmrc) to see what the current version is. If you have [nvm](https://github.com/creationix/nvm)
You can check [`.nvmrc` in the `development` branch](https://github.com/loki-project/session-desktop/blob/development/.nvmrc) to see what the current version is. If you have [nvm](https://github.com/creationix/nvm)
you can just run `nvm use` in the project directory and it will switch to the project's
desired Node.js version. [nvm for windows](https://github.com/coreybutler/nvm-windows) is
still useful, but it doesn't support `.nvmrc` files.
Expand Down Expand Up @@ -56,8 +56,8 @@ Then you need `git`, if you don't have that yet: https://git-scm.com/
Now, run these commands in your preferred terminal in a good directory for development:

```
git clone https://github.com/loki-project/loki-messenger.git
cd loki-messenger
git clone https://github.com/loki-project/session-desktop.git
cd session-desktop
npm install --global yarn # (only if you don’t already have `yarn`)
yarn install --frozen-lockfile # Install and build dependencies (this will take a while)
yarn grunt # Generate final JS and CSS assets
Expand Down Expand Up @@ -115,7 +115,7 @@ NODE_APP_INSTANCE=alice yarn run start
```

This changes the [userData](https://electron.atom.io/docs/all/#appgetpathname)
directory from `%appData%/Loki-Messenger` to `%appData%/Loki-Messenger-aliceProfile`.
directory from `%appData%/Session` to `%appData%/Session-aliceProfile`.

# Making changes

Expand Down
24 changes: 24 additions & 0 deletions RELEASING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Releasing

Creating a new Session Desktop release is very simple.

1. Bump up the version in `package.json`.
2. Merge all changes required into the `master` branch.
* This will trigger github actions to start building a draft release
3. After github actions has finished building. Go to Release page in the repository.
4. Click on the draft release and change the tag target to `master`.
5. Add in release notes.
6. Generate gpg signatures.
7. Click publish release.

## Notes

Artifacts attached in the release shouldn't be deleted! These include the yml files (latest, latest-mac, latest-linux). These are all necessary to get auto updating to work correctly.

### Mac

Mac currently uses 2 formats `dmg` and `zip`.
We need the `zip` format for auto updating to work correctly.
We also need the `dmg` because on MacOS Catalina, there is a system bug where extracting the artifact `zip` using the default _Archive Utility_ will make it so the extracted application is invalid and it will fail to open. A work around for this is to extract the `zip` using an alternate program such as _The Unarchiver_.

Once this bug is fixed we can go back to using the `zip` format by itself.
8 changes: 4 additions & 4 deletions _locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1460,19 +1460,19 @@
"description": ""
},
"autoUpdateNewVersionTitle": {
"message": "Signal update available",
"message": "Session update available",
"description": ""
},
"autoUpdateNewVersionMessage": {
"message": "There is a new version of Signal available.",
"message": "There is a new version of Session available.",
"description": ""
},
"autoUpdateNewVersionInstructions": {
"message": "Press Restart Signal to apply the updates.",
"message": "Press Restart Session to apply the updates.",
"description": ""
},
"autoUpdateRestartButtonLabel": {
"message": "Restart Signal",
"message": "Restart Session",
"description": ""
},
"autoUpdateLaterButtonLabel": {
Expand Down
4 changes: 2 additions & 2 deletions _locales/bg/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1468,11 +1468,11 @@
"description": ""
},
"autoUpdateNewVersionInstructions": {
"message": "Натиснете Рестарт на Signal за да валидирате промените.",
"message": "Натиснете Рестарт на Session за да валидирате промените.",
"description": ""
},
"autoUpdateRestartButtonLabel": {
"message": "Рестарт на Signal",
"message": "Рестарт на Session",
"description": ""
},
"autoUpdateLaterButtonLabel": {
Expand Down
8 changes: 4 additions & 4 deletions _locales/ca/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1460,19 +1460,19 @@
"description": ""
},
"autoUpdateNewVersionTitle": {
"message": "Disponible una actualització del Signal",
"message": "Disponible una actualització del Session",
"description": ""
},
"autoUpdateNewVersionMessage": {
"message": "Hi ha disponible una versió nova del Signal.",
"message": "Hi ha disponible una versió nova del Session.",
"description": ""
},
"autoUpdateNewVersionInstructions": {
"message": "Premeu Reinicia el Signal per a aplicar les actualitzacions.",
"message": "Premeu Reinicia el Session per a aplicar les actualitzacions.",
"description": ""
},
"autoUpdateRestartButtonLabel": {
"message": "Reinicia el Signal",
"message": "Reinicia el Session",
"description": ""
},
"autoUpdateLaterButtonLabel": {
Expand Down
8 changes: 4 additions & 4 deletions _locales/cs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1460,19 +1460,19 @@
"description": ""
},
"autoUpdateNewVersionTitle": {
"message": "Dostupná aktualizace Signal",
"message": "Dostupná aktualizace Session",
"description": ""
},
"autoUpdateNewVersionMessage": {
"message": "Je k dispozici nová verze aplikace Signal.",
"message": "Je k dispozici nová verze aplikace Session.",
"description": ""
},
"autoUpdateNewVersionInstructions": {
"message": "Stiskněte na Restartovat Signal pro aplikování změn",
"message": "Stiskněte na Restartovat Session pro aplikování změn",
"description": ""
},
"autoUpdateRestartButtonLabel": {
"message": "Restartovat Signal",
"message": "Restartovat Session",
"description": ""
},
"autoUpdateLaterButtonLabel": {
Expand Down
8 changes: 4 additions & 4 deletions _locales/da/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1460,19 +1460,19 @@
"description": ""
},
"autoUpdateNewVersionTitle": {
"message": "Signalopdatering tilgængelig",
"message": "Sessionopdatering tilgængelig",
"description": ""
},
"autoUpdateNewVersionMessage": {
"message": "Der er en ny version af Signal tilgængelig.",
"message": "Der er en ny version af Session tilgængelig.",
"description": ""
},
"autoUpdateNewVersionInstructions": {
"message": "Genstart Signal for at anvende opdateringerne.",
"message": "Genstart Session for at anvende opdateringerne.",
"description": ""
},
"autoUpdateRestartButtonLabel": {
"message": "Genstart Signal",
"message": "Genstart Session",
"description": ""
},
"autoUpdateLaterButtonLabel": {
Expand Down
8 changes: 4 additions & 4 deletions _locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1460,19 +1460,19 @@
"description": ""
},
"autoUpdateNewVersionTitle": {
"message": "Aktualisierung für Signal verfügbar",
"message": "Aktualisierung für Session verfügbar",
"description": ""
},
"autoUpdateNewVersionMessage": {
"message": "Eine neue Version von Signal ist verfügbar.",
"message": "Eine neue Version von Session ist verfügbar.",
"description": ""
},
"autoUpdateNewVersionInstructions": {
"message": "Zum Aktualisieren klicke auf »Signal neu starten«.",
"message": "Zum Aktualisieren klicke auf »Session neu starten«.",
"description": ""
},
"autoUpdateRestartButtonLabel": {
"message": "Signal neu starten",
"message": "Session neu starten",
"description": ""
},
"autoUpdateLaterButtonLabel": {
Expand Down

0 comments on commit f0bb328

Please sign in to comment.