Skip to content

Commit

Permalink
Release 2021.10
Browse files Browse the repository at this point in the history
Updated changes.md and version.txt for the new release.  Also upgraded
InnoSetup to 6.2.0 for the Windows installer.  Also this is the first release
where versioning changes to Year.Month convention.
  • Loading branch information
alex-hhh committed Oct 2, 2021
1 parent 52badd8 commit c2278d5
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 24 deletions.
28 changes: 28 additions & 0 deletions docs/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,34 @@ git log --submodule=log --patch v1.10.2..v1.11 \
| awk '/^commit/,/^diff/ { if ($1 != "diff") { print; } }'`
```

# Release 2021.10 (October 2021)

* Changed release versioning scheme to use YEAR.MONTH -- this is more meaning
full to the end user and should be more obvious if they use an old version.

* Fixed issue #73 where an activity would fail to import when the user stopped
running while keeping the watch recording.


* Fixed issue #74 where heard rate samples would be associated with the wrong
pool length in lap swimming activities.

* Heart Rate data is now shown for lap swimming activities -- currently this
only works for activities recorded with a device that measures heart rate at
the wrist. See issue #4

* Updated the tab bar in the Trends view to allow reordering tabs by dragging
them.

* The default set of columns visible in various views has been restricted to a
smaller subset to make the activities and lap views easier to follow. This
only affects new users of the application and the visible columns can be
edited using the "View/Setup Columns..." menu item.

* Added support for GPS segments -- these allow defining sections of a route
(e.g. a hill climb) and inspecting all activities that traverse that
section, allowing comparing time, power, speed, etc. on the given segment.

# Release 1.12.0 (June 2021)

* Added 100 meter splits as custom intervals for sessions (this is useful for
Expand Down
7 changes: 4 additions & 3 deletions etc/scripts/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ jobs:

- script: |
set /p APP_VERSION=<version.txt
set V=%APP_VERSION%.%BUILD_BUILDID%
set D=ActivityLog2 - Analyze Swim Bike and Run Data
set V=%APP_VERSION%
set PV=%APP_VERSION%.%BUILD_BUILDID%
set D=ActivityLog2 - Analyze Swim, Bike and Run Data
set P=ActivityLog2
etc\scripts\verpatch .\dist\ActivityLog2.exe %V% /s desc "%D%" /s product %P% /pv %V%
etc\scripts\verpatch .\dist\ActivityLog2.exe %V% /s desc "%D%" /s product %P% /pv %PV%
iscc /DMyAppVersion=%V% etc\scripts\install.iss
displayName: Creating Installer
Expand Down
21 changes: 3 additions & 18 deletions etc/scripts/install-inno-setup.ps1
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
# This is the site from which Inno Setup can be downloaded, unfortunately,
# this fails occasionally (maybe it is hosted on a small server?). This
# script actually downloads it from my Google Drive account
$original_url = "http://www.jrsoftware.org/download.php/is-unicode.exe";

# The site for Inno Setup has no HTTPS so, we ensure that only the expected
# version is actually downloaded and installed.

$expected_hash = "5856471BA4DF94772FE415687F70CC87ADD8BC228EFB289DDADAE55BF0F2759B";

# Google Drive file location
$gd_file_id = "1UQ4587WM_CPt9gAbkt-J8gJrJl4sFSdv";
$gd_url = "https://drive.google.com/uc?export=download&id=$gd_file_id"

$exit_code = 0;
$url = $gd_url; # download from Google Drive
$exit_code = 0;

# NOTE: race condition here between deleting the temporary file and creating a
# directory with the same name
Expand All @@ -35,8 +20,8 @@ Write-Output "Downloading into $dfile ..."
# `fetch.sh` script, and we just call this script to download the installer
# for us.

$file_id = "1UQ4587WM_CPt9gAbkt-J8gJrJl4sFSdv";
$file_hash = "510902ffe43e3ef3504e4567ece45f7cd694f5df";
$file_id = "1n40We1JLV7mM4CKdmLzaIKoGLAeK1oy9";
$file_hash = "c3bd3170cf95c8712561220392a074d9991995b6";

$dprocess = Start-Process -FilePath bash `
-ArgumentList "./fetch.sh -o $dfile -s $file_hash $file_id" `
Expand Down
4 changes: 2 additions & 2 deletions rkt/app-info.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; app-info.rkt -- application version and related stuff
;;
;; This file is part of ActivityLog2 -- https://github.com/alex-hhh/ActivityLog2
;; Copyright (c) 2020 Alex Harsányi <[email protected]>
;; Copyright (c) 2020, 2021 Alex Harsányi <[email protected]>
;;
;; This program is free software: you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by the Free
Expand Down Expand Up @@ -47,7 +47,7 @@
;; silly environment variable values...
(build-id (getenv "BUILD_BUILDID")))
(if (and build-id (string->number build-id))
(string-append version "." build-id)
(string-append version " build #" build-id)
version))))]))

(define-syntax (embedded-build-number stx)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.13.99
2021.10

0 comments on commit c2278d5

Please sign in to comment.