Skip to content

Commit

Permalink
Merge pull request #822 from hovancik/release
Browse files Browse the repository at this point in the history
Release 1.4
  • Loading branch information
hovancik authored Dec 25, 2020
2 parents 6655ebd + d6dcd83 commit 6b2a9ad
Show file tree
Hide file tree
Showing 11 changed files with 249 additions and 145 deletions.
84 changes: 84 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
---
kind: pipeline
type: docker
name: amd64 Linux Build

platform:
os: linux
arch: amd64

steps:
- name: Build
image: amd64/node:12.18.3-buster
commands:
- apt update && apt-get install --no-install-recommends -y gcc-multilib g++-multilib bsdtar rpm libopenjp2-tools
- npm install
- npm install npm -g
- node_modules/.bin/electron-builder build --x64 --ia32
environment:
GH_TOKEN:
from_secret: GH_TOKEN

trigger:
branch:
- release
event:
- push

---
kind: pipeline
type: docker
name: arm64v8 Linux Build

platform:
os: linux
arch: arm64

steps:
- name: Build
image: arm64v8/node:12.18.3-buster
commands:
- apt update && apt-get install --no-install-recommends -y ruby-full bsdtar rpm libopenjp2-tools
- gem install fpm -v 1.10.1
- export USE_SYSTEM_FPM="true"
- npm install
- npm install npm -g
- node_modules/.bin/electron-builder build --arm64
environment:
GH_TOKEN:
from_secret: GH_TOKEN

trigger:
branch:
- release
event:
- push

---
kind: pipeline
type: docker
name: arm32v7 Linux Build

platform:
os: linux
arch: arm

steps:
- name: Build
image: arm32v7/node:12.18.3-buster
commands:
- apt update && apt-get install --no-install-recommends -y ruby-full bsdtar rpm libopenjp2-tools
- gem install fpm -v 1.10.1
- export USE_SYSTEM_FPM="true"
- npm install
- npm install npm -g
- node_modules/.bin/electron-builder build --armv7l
environment:
GH_TOKEN:
from_secret: GH_TOKEN

trigger:
branch:
- release
event:
- push
21 changes: 21 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: macOS build

on:
push:
branches:
- release

jobs:
build:
runs-on: macos-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '12.18.3'
- run: npm install
- run: npm install npm -g
- run: node_modules/.bin/electron-builder build
env:
GH_TOKEN: ${{ secrets.github_token }}
21 changes: 21 additions & 0 deletions .github/workflows/snap-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Linux Snap build

on:
push:
branches:
- release

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '12.18.3'
- run: npm install -g npm
- run: npm install
- run: node_modules/.bin/electron-builder --linux snap -c.snap.publish=github
env:
GH_TOKEN: ${{ secrets.github_token }}
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
with:
node-version: '12.18.3'
- run: npm install
- run: npm install npm -g
- run: npx nyc --reporter=lcov npm test
env:
CI: true
Expand Down
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

14 changes: 7 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [1.4.0] - 2020-12-25
### Added
- Better handling of app errors: error will ask user to report issue
- Better handling of app errors: error will ask user to report issue
- Esperanto translations
- Norwegian translations
- Snow white theme
- experimental Linux builds for arm

### Changed
- Updated Bulgarian translations
- Updated Swedish translations
- Updated Chinese translations
- Updated Slovak translations
- Updated Czech translations
- Updated many translations

### Fixed
- notification of new version being showed even disabled
- browser tab non-responsive after resuming
- don't show notification title for macOS Big Sur
- DND mode in macOS Big Sur

## [1.3.0] - 2020-11-08
### Added
Expand Down Expand Up @@ -529,7 +528,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- resume/pause functionality for reminder
- scripts for creating installers for OS X, Windows, Linux

[Unreleased]: https://github.com/hovancik/stretchly/compare/v1.3.0...HEAD
[Unreleased]: https://github.com/hovancik/stretchly/compare/v1.4.0...HEAD
[1.4.0]: https://github.com/hovancik/stretchly/compare/v1.3.0...v1.4.0
[1.3.0]: https://github.com/hovancik/stretchly/compare/v1.2.0...v1.3.0
[1.2.0]: https://github.com/hovancik/stretchly/compare/v1.1.0...v1.2.0
[1.1.0]: https://github.com/hovancik/stretchly/compare/v1.0.0...v1.1.0
Expand Down
16 changes: 8 additions & 8 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Stretchly",
"version": "1.3.0",
"version": "1.4.0",
"description": "The break time reminder app",
"main": "main.js",
"repository": {
Expand All @@ -21,11 +21,11 @@
"homepage": "https://hovancik.net/stretchly",
"dependencies": {
"@meetfranz/electron-notification-state": "^1.0.0",
"electron-log": "^4.3.0",
"electron-log": "^4.3.1",
"i18next": "^19.8.4",
"i18next-node-fs-backend": "^2.1.3",
"luxon": "^1.25.0",
"meeussunmoon": "^3.0.2",
"meeussunmoon": "^3.0.3",
"semver": "^7.3.4",
"windows-focus-assist": "^1.2.1"
},
Expand Down
13 changes: 4 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
os: Visual Studio 2019

platform:
- x86
- x64

skip_tags: true

environment:
nodejs_version: "12.18.3"

init:
- tzutil /s "W. Europe Standard Time"
branches:
only:
- release

cache:
- node_modules -> package.json
Expand All @@ -20,10 +20,5 @@ install:
- npm install npm -g
- npm install

test_script:
- node --version
- npm --version
- npx nyc --reporter=lcov npm test && npx codecov

build_script:
- IF %APPVEYOR_REPO_BRANCH%==release (npm run dist)
- node_modules/.bin/electron-builder build --x64 --ia32
Loading

0 comments on commit 6b2a9ad

Please sign in to comment.