diff --git a/.travis.env.enc b/.travis.env.enc deleted file mode 100644 index 33a8cc1..0000000 Binary files a/.travis.env.enc and /dev/null differ diff --git a/.travis.env.example b/.travis.env.example deleted file mode 100644 index bee4b71..0000000 --- a/.travis.env.example +++ /dev/null @@ -1,4 +0,0 @@ -export CSC_LINK="base64 encoded data for a Developer ID Application cert and key in .p12 format" -export CSC_KEY_PASSWORD="passphrase for the .p12 package" -export APPLEID="notarizing-account@example.com" -export APPLEIDPASS="needed-for-notarizing" \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1d97f1f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -language: node_js -node_js: -- 12 -os: -- osx -- linux -sudo: required -dist: bionic -osx_image: xcode11 -compiler: -- clang -addons: - apt: - packages: - - libopenjp2-tools -cache: - npm: false -before_install: -- openssl aes-256-cbc -K $encrypted_fc666da9e2f5_key -iv $encrypted_fc666da9e2f5_iv - -in .travis.env.enc -out .travis.env -d; source .travis.env; -- node --version -- yarn --version -install: -- yarn -before_script: -- yarn list -script: -- "./scripts/travis.sh" -deploy: - provider: snap - snap: dist/*.snap - channel: edge - skip_cleanup: true - on: - condition: $TRAVIS_OS_NAME = "linux" \ No newline at end of file diff --git a/Makefile b/Makefile index 3f997bf..388dc4b 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,4 @@ win: node_modules ci: test dist -encryptenv: - travis encrypt-file .travis.env --add - .PHONY: dist clean distclean dev test mac win ci encryptenv diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 5b5b552..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,36 +0,0 @@ -version: build{build} -platform: - - x64 -os: Visual Studio 2017 - -environment: - GYP_MSVS_VERSION: 2015 - GH_TOKEN: - secure: lAoTVd9zu2MCJs2+NplDMegxezyoXTU5HK4OYpQQrJCOX9Mq542OcrqZlQa61qxn - - AZURE_KEY_VAULT_URL: - secure: GYdBKr1bwel6q0nE0k/K74HvIIHdp8EkqQOURzYjcm22na3pz4lx73Prqt163969 - AZURE_KEY_CLIENT_ID: - secure: PaHBZKGDgPBnTuKIqinapp2NL4KW/Z3pDKwDCkxNBmuzP56WTfKOM+Vy3obmj+AS - AZURE_KEY_CLIENT_SECRET: - secure: 2LoLviUUNk5knt3Sq5NIbCvKNhx2Szs93pEyCgYErLJFPf2pgxgO1CWeDHF0U2VU - AZURE_KEY_VAULT_CERTIFICATE: - secure: VDfW/dOV7r5qSsjeafl7NpD/hnyHJQL/NZmuAub59NrVxRiSRq3DYAeVksNAi4TW - -init: - - git config --global core.autocrlf input - -install: - - ps: Install-Product node 12 x64 - - ps: irm ipinfo.io/ip - - dotnet tool install --global AzureSignTool --version 2.0.17 - - git reset --hard HEAD - - node --version - - yarn --version - - python --version - - yarn - - yarn list - - yarn run test - -build_script: - - yarn run win diff --git a/docs/OfficialBuilds.md b/docs/OfficialBuilds.md index b95ff73..0080d66 100644 --- a/docs/OfficialBuilds.md +++ b/docs/OfficialBuilds.md @@ -1,7 +1,6 @@ # Official builds -The official builds of this app are generated on [Travis](https://travis-ci.org/irccloud/irccloud-desktop) (macOS, Linux) and -[AppVeyor](https://ci.appveyor.com/project/russss/irccloud-desktop) (Windows) +The official builds of this app are generated by Github Actions ## Code signing @@ -23,26 +22,7 @@ base64 -i cert.p12 -o cert.p12.b64 On macOS, the .p12 file is exported from Keychain Access. Make sure to expand the Developer ID Application cert and select it along with its key before exporting. -Environment variables are encrypted by the [`travis`](https://github.com/travis-ci/travis.rb#readme) -command line tool, available as a gem. - -Install: `gem install travis` - -After installing the gem you need to authenticate to Travis with your GitHub -credentials using `travis login`. You can either enter your password or (e.g. if using 2FA) -use an [access token](https://help.github.com/articles/creating-an-access-token-for-command-line-use/). - -GitHub credentials are only needed the first time you run login, at which point you'll get -a Travis access token in `~/.travis/config.yml` and you can revoke your GitHub access token after that. More details in the -[docs](https://github.com/travis-ci/travis.rb#login). - -Once you've authenticated with Travis, copy .travis.env.example to `.travis.env` and fill -in the appropriate variables. Then run `make encryptenv` to create the encrypted file -.travis.env.enc. Make sure you don't commit the unencrypted .travis.env -(it's in [`.gitignore`](../.gitignore)) - -This file will be decrypted with a key hosted on Travis during a build and the environment -will be set automatically. +Environment variables are encrypted repository secrets ### Windows @@ -75,5 +55,4 @@ The AzureSignTool can be installed with the following command after installing . dotnet tool install --global AzureSignTool --version 2.0.17 ``` -Environment variables are encrypted via the [AppVeyor web interface](https://ci.appveyor.com/tools/encrypt) -and set in [appveyor.yml](../appveyor.yml) +Environment variables are encrypted repository secrets diff --git a/scripts/travis.sh b/scripts/travis.sh deleted file mode 100755 index 999cafe..0000000 --- a/scripts/travis.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -ev -yarn run test -if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - yarn run snyk - yarn run mac -fi -if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - sudo snap install snapcraft --classic - sudo snap install multipass --beta --classic - sudo snap install review-tools - yarn run linux -fi \ No newline at end of file