Skip to content
Snippets Groups Projects
Commit 4fcc4518 authored by Markus Alexander Kuppe's avatar Markus Alexander Kuppe
Browse files

Bump version numbers and dates for 1.7.3/Ulpian release.

[Build]
parent f10aa783
No related branches found
No related tags found
No related merge requests found
Showing
with 52 additions and 36 deletions
name: CI
on:
workflow_dispatch:
push:
# Sequence of patterns matched against refs/heads
branches:
- v1.7.2 # Push events on master branch
- v1.7.3 # Push events on master branch
jobs:
......@@ -16,8 +17,8 @@ jobs:
include:
- operating-system: ubuntu-latest
MVN_COMMAND: xvfb-run mvn -Dtest.skip=true -Dmaven.test.failure.ignore=true
GITHUB_RELEASE_NAME: The Theano release
TOOLBOX_PRODUCT_ZIP: TLAToolbox-1.7.2-linux.gtk.x86_64.zip
GITHUB_RELEASE_NAME: The Ulpian release
TOOLBOX_PRODUCT_ZIP: TLAToolbox-1.7.3-linux.gtk.x86_64.zip
steps:
......@@ -75,12 +76,12 @@ jobs:
## Generate changelog
cd general/docs/changelogs
## Append sha1 sum to changelog (last line of changelog has the table header).
echo "$(sha1sum ../../../tlatools/org.lamport.tlatools/dist/tla2tools.jar | cut -f 1 -d " ")|tla2tools.jar" >> ch1_7_2.md
echo "$(sha1sum ../../../tlatools/org.lamport.tlatools/dist/tla2tools.jar | cut -f 1 -d " ")|tla2tools.jar" >> ch1_7_3.md
## Two above as one-liner without intermediate file.
$(jq -n --argjson changelog "$(cat ch1_7_2.md | jq --raw-input --slurp .)" -f gh-1_7_2.jq > gh-1_7_2.json)
$(jq -n --argjson changelog "$(cat ch1_7_3.md | jq --raw-input --slurp .)" -f gh-1_7_3.jq > gh-1_7_3.json)
## Update draft release with latest changelog in case it changed.
## https://developer.github.com/v3/repos/releases/#edit-a-release
curl -sS -H "Authorization: token ${{secrets.GITHUB_TOKEN}}" https://api.github.com/repos/${{ github.repository }}/releases/$DRAFT_RELEASE -d @gh-1_7_2.json -X PATCH --header "Content-Type: application/json"
curl -sS -H "Authorization: token ${{secrets.GITHUB_TOKEN}}" https://api.github.com/repos/${{ github.repository }}/releases/$DRAFT_RELEASE -d @gh-1_7_3.json -X PATCH --header "Content-Type: application/json"
##
## Update all git tags to make the download urls work, i.e.
......
......@@ -46,7 +46,7 @@ for (x in labels) {
}
// the macosx zip on the master node to have it signed with the Apple certificate on macosx. However, only master
// has the lamport certificate to sign the individual toolbox bundles.
stash includes: 'toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.1-macosx.cocoa.x86_64.zip', name: 'toolbox'
stash includes: 'toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.3-macosx.cocoa.x86_64.zip', name: 'toolbox'
} else {
withMaven(
// Maven installation declared in the Jenkins "Global Tool Configuration"
......@@ -153,7 +153,7 @@ node ('master') {
}
stage('RenderChangelog') { // Render the github flavord markdown to html
sh 'grip --context=tlaplus/tlaplus --export ${WORKSPACE}/general/docs/changelogs/ch1_7_1.md ${WORKSPACE}/general/docs/changelogs/changelog.html'
sh 'grip --context=tlaplus/tlaplus --export ${WORKSPACE}/general/docs/changelogs/ch1_7_3.md ${WORKSPACE}/general/docs/changelogs/changelog.html'
}
}
......@@ -162,11 +162,11 @@ node ('macos') {
sh 'rm -rf *'
unstash 'toolbox'
sh 'ls -lah'
sh 'unzip toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.1-macosx.cocoa.x86_64.zip'
sh 'unzip toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.3-macosx.cocoa.x86_64.zip'
sh 'codesign -f -s "Developer ID Application: M K (3PCM4M3RWK)" -v "TLA+ Toolbox.app" --deep'
sh 'ditto -ck --sequesterRsrc --keepParent "TLA+ Toolbox.app" TLAToolbox-1.7.1-macosx.cocoa.x86_64.zip'
sh 'mv TLAToolbox-1.7.1-macosx.cocoa.x86_64.zip toolbox/org.lamport.tla.toolbox.product.product/target/products/'
stash includes: 'toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.1-macosx.cocoa.x86_64.zip', name: 'signed'
sh 'ditto -ck --sequesterRsrc --keepParent "TLA+ Toolbox.app" TLAToolbox-1.7.3-macosx.cocoa.x86_64.zip'
sh 'mv TLAToolbox-1.7.3-macosx.cocoa.x86_64.zip toolbox/org.lamport.tla.toolbox.product.product/target/products/'
stash includes: 'toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.3-macosx.cocoa.x86_64.zip', name: 'signed'
}
}
......@@ -188,13 +188,13 @@ node ('master') {
cd ${WORKSPACE}/general/docs/changelogs
## Append sha1 sum to changelog (last line of changelog has the table header).
echo "$(sha1sum ${WORKSPACE}/tlatools/org.lamport.tlatools/dist/tla2tools.jar | cut -f 1 -d " ")|tla2tools.jar" >> ch1_7_1.md
echo "$(sha1sum ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.1-win32.win32.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.7.1-win32.win32.x86_64.zip" >> ch1_7_1.md
echo "$(sha1sum ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.1-macosx.cocoa.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.7.1-macosx.cocoa.x86_64.zip" >> ch1_7_1.md
echo "$(sha1sum ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.1-linux.gtk.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.7.1-linux.gtk.x86_64.zip" >> ch1_7_1.md
echo "$(sha1sum ${WORKSPACE}/tlatools/org.lamport.tlatools/dist/tla2tools.jar | cut -f 1 -d " ")|tla2tools.jar" >> ch1_7_3.md
echo "$(sha1sum ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.3-win32.win32.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.7.3-win32.win32.x86_64.zip" >> ch1_7_3.md
echo "$(sha1sum ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.3-macosx.cocoa.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.7.3-macosx.cocoa.x86_64.zip" >> ch1_7_3.md
echo "$(sha1sum ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.3-linux.gtk.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.7.3-linux.gtk.x86_64.zip" >> ch1_7_3.md
## Two above as one-liner without intermediate file.
$(jq -n --argjson changelog "$(cat ch1_7_1.md | jq --raw-input --slurp .)" -f gh-1_7_1.jq > gh-1_7_1.json)
$(jq -n --argjson changelog "$(cat ch1_7_3.md | jq --raw-input --slurp .)" -f gh-1_7_3.jq > gh-1_7_3.json)
## Get id of existing draft release with given name.
DRAFT_RELEASE=$(curl -sS -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/tlaplus/tlaplus/releases --header "Content-Type: application/json" | jq '.[]| select(.draft==true and .name=="The Brontinus release") | .id')
......@@ -202,7 +202,7 @@ node ('master') {
## Update draft release with latest changelog in case it changed.
## https://developer.github.com/v3/repos/releases/#edit-a-release
curl -sS -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE -d @gh-1_7_1.json -X PATCH --header "Content-Type: application/json"
curl -sS -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE -d @gh-1_7_3.json -X PATCH --header "Content-Type: application/json"
## Remove old assets otherwise upload below will error.
ASSETS=$(curl -sS -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets --header "Content-Type: application/json" | jq '.[]| .id')
......@@ -216,15 +216,15 @@ node ('master') {
## tla2tools.jar
curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=tla2tools.jar --upload-file ${WORKSPACE}/tlatools/org.lamport.tlatools/dist/tla2tools.jar
## macOS
curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.7.1-macosx.cocoa.x86_64.zip --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.1-macosx.cocoa.x86_64.zip
curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.7.3-macosx.cocoa.x86_64.zip --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.3-macosx.cocoa.x86_64.zip
## win32
curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.7.1-win32.win32.x86_64.zip --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.1-win32.win32.x86_64.zip
curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.7.3-win32.win32.x86_64.zip --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.3-win32.win32.x86_64.zip
## Linux
curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.7.1-linux.gtk.x86_64.zip --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.1-linux.gtk.x86_64.zip
curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.7.3-linux.gtk.x86_64.zip --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.7.3-linux.gtk.x86_64.zip
## deb
#curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.7.1-linux.gtk.amd64.deb --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/repository/TLAToolbox-1.7.1-linux.gtk.amd64.deb
#curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.7.3-linux.gtk.amd64.deb --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/repository/TLAToolbox-1.7.3-linux.gtk.amd64.deb
## RPM
#curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.7.1-linux.gtk.amd64.rpm --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLA\\+Toolbox-1.7.1~*.x86_64.rpm
#curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.7.3-linux.gtk.amd64.rpm --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLA\\+Toolbox-1.7.3~*.x86_64.rpm
'''
}
}
......
The [Ulpian](https://en.wikipedia.org/wiki/Ulpian) release is based on the [1.7.3 branch](https://github.com/tlaplus/tlaplus/releases/tag/v1.7.3) and fixes the issue below.
### Changelog
* [LazyValue can cause TLC to generate too many or too few states](https://github.com/tlaplus/tlaplus/issues/798)
### Checksums
sha1sum|file
------------ | -------------
\ No newline at end of file
{
"tag_name": "v1.7.3",
"name": "The Ulpian release",
"draft": true,
"prerelease": false,
"body": $changelog
}
\ No newline at end of file
......@@ -123,7 +123,7 @@
<!-- Align toolbox.version with the version in
org.lamport.tla.toolbox.product.product.product
product.version. -->
<toolbox.version>1.7.1</toolbox.version>
<toolbox.version>1.7.3</toolbox.version>
<!-- This is used in org.lamport.tla.toolbox.product.uitest but
has been placed at the top level should it need be referenced
......
......@@ -10,7 +10,7 @@
<groupId>org.lamport</groupId>
<artifactId>tla2tools</artifactId>
<name>TLA+ Tools</name>
<version>1.7.2-SNAPSHOT</version>
<version>1.7.3-SNAPSHOT</version>
<description>The TLC model checker, the syntax and semantic checker SANY, the PlusCal translator, and the LaTeX pretty printer.</description>
<packaging>jar</packaging>
......
......@@ -17,7 +17,7 @@
<groupId>org.lamport</groupId>
<artifactId>tla2tools</artifactId>
<name>TLA+ Tools</name>
<version>1.7.1-SNAPSHOT</version>
<version>1.7.3-SNAPSHOT</version>
<description>The TLC model checker, the syntax and semantic checker SANY, the PlusCal translator, and the LaTeX pretty printer.</description>
<packaging>jar</packaging>
......
......@@ -194,7 +194,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
<version>1.7.1</version>
<version>1.7.3</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -23,7 +23,7 @@ public class TLCGlobals
public static final int DEFAULT_CHECKPOINT_DURATION = (30 * 60 * 1000) + 42;
// The current version of TLC
public static String versionOfTLC = "Version 2.17 of 02 February 2022";
public static String versionOfTLC = "Version 2.18 of 20 March 2023";
// The bound for set enumeration, used for pretty printing
public static int enumBound = 2000;
......
......@@ -11,7 +11,7 @@
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.doc</artifactId>
<version>1.7.1-SNAPSHOT</version>
<version>1.7.3-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<!-- Do not include non-code project in Sonar reporting. -->
......
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="TLA+ Toolbox" uid="org.lamport.tla.toolbox.product.product" id="org.lamport.tla.toolbox.product.standalone.product" application="org.lamport.tla.toolbox.application" version="1.7.2.qualifier" useFeatures="true" includeLaunchers="true">
<product name="TLA+ Toolbox" uid="org.lamport.tla.toolbox.product.product" id="org.lamport.tla.toolbox.product.standalone.product" application="org.lamport.tla.toolbox.application" version="1.7.3.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.lamport.tla.toolbox.product.standalone/images/splash_small.png"/>
<text>
TLA+ Toolbox provides a user interface for TLA+ Tools.
This is Version 1.7.2 of 02 February 2022 and includes:
This is Version 1.7.3 of 20 March 2023 and includes:
- SANY Version 2.2 of 20 April 2020
- TLC Version 2.17 of 02 Febraury 2022
- TLC Version 2.18 of 20 March 2023
- PlusCal Version 1.11 of 31 December 2020
- TLATeX Version 1.0 of 20 September 2017
......@@ -95,11 +95,11 @@ openFile
<plugin id="org.lamport.tla.toolbox.jclouds" autoStart="true" startLevel="4" />
<plugin id="packet" autoStart="true" startLevel="4" />
<plugin id="sts" autoStart="true" startLevel="4" />
<property name="eclipse.buildId" value="1.7.2" />
<property name="eclipse.buildId" value="1.7.3" />
</configurations>
<repositories>
<repository location="http://lamport.org/tlatoolbox/branches/1.7.2/toolboxUpdate/" enabled="true" />
<repository location="http://lamport.org/tlatoolbox/branches/1.7.3/toolboxUpdate/" enabled="true" />
<repository location="http://lamport.org/tlatoolbox/ci/toolboxUpdate/" enabled="false" />
</repositories>
......
......@@ -30,7 +30,7 @@
</property>
<property
name="aboutText"
value="TLA+ Toolbox provides a user interface for TLA+ Tools. &#x0A;&#x0A;This is Version 1.7.2 of 02 February 2022 and includes:&#x0A; - SANY Version 2.2 of 20 April 2020&#x0A; - TLC Version 2.17 of 02 February 2022&#x0A; - PlusCal Version 1.11 of 31 December 2020&#x0A; - TLATeX Version 1.0 of 20 September 2017&#x0A;&#x0A;Don&apos;t forget to click on help. You can learn about features that you never knew about or have forgotten.&#x0A;&#x0A;Please send us reports of problems or suggestions; see https://groups.google.com/d/forum/tlaplus .&#x0A;&#x0A;Some icons used in the Toolbox were provided by www.flaticon.com">
value="TLA+ Toolbox provides a user interface for TLA+ Tools. &#x0A;&#x0A;This is Version 1.7.3 of 20 March 2023 and includes:&#x0A; - SANY Version 2.2 of 20 April 2020&#x0A; - TLC Version 2.18 of 20 March 2023&#x0A; - PlusCal Version 1.11 of 31 December 2020&#x0A; - TLATeX Version 1.0 of 20 September 2017&#x0A;&#x0A;Don&apos;t forget to click on help. You can learn about features that you never knew about or have forgotten.&#x0A;&#x0A;Please send us reports of problems or suggestions; see https://groups.google.com/d/forum/tlaplus .&#x0A;&#x0A;Some icons used in the Toolbox were provided by www.flaticon.com">
</property>
<property
name="aboutImage"
......
......@@ -431,7 +431,7 @@ public class ToolboxIntroPart extends IntroPart implements IIntroPart {
final Label lblVersion = new Label(outerContainer, SWT.WRAP);
lblVersion.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1));
lblVersion.setText("Version 1.7.2 of 02 February 2022");
lblVersion.setText("Version 1.7.3 of 20 March 2023");
lblVersion.setBackground(backgroundColor);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment