Skip to content

Commit

Permalink
Merge branch 'allow-tags-in-linux-release' into feature/issue-759_ide…
Browse files Browse the repository at this point in the history
…mpotent-sha
  • Loading branch information
artoonie committed Oct 24, 2023
2 parents 3bf068b + 294997c commit 71e347d
Show file tree
Hide file tree
Showing 147 changed files with 175 additions and 152 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ jobs:
# and while we could use some regex to figure out the version number automatically, it seems cleaner
# to know the expected version number upfront.
if [ ${{ runner.os }} == 'Windows' ]; then
echo "FILEPATH=build/jpackage/RCTab-1.4.0-alpha.exe" >> $GITHUB_OUTPUT
echo "FILEPATH=build/jpackage/RCTab-1.3.999.exe" >> $GITHUB_OUTPUT
elif [ ${{ runner.os }} == 'Linux' ]; then
echo "FILEPATH=build/jpackage/rctab_1.4.0-alpha-1_amd64.deb" >> $GITHUB_OUTPUT
echo "FILEPATH=build/jpackage/rctab_1.3.999-1_amd64.deb" >> $GITHUB_OUTPUT
else
echo "FILEPATH=build/jpackage/RCTab-1.4.0-alpha.dmg" >> $GITHUB_OUTPUT
echo "FILEPATH=build/jpackage/RCTab-1.3.999.dmg" >> $GITHUB_OUTPUT
fi
- name: "Create executable filename"
id: exefn
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jlink {
launcher {
// TODO Sync version number with release.yml and Main.java (github.com/BrightSpots/rcv/issues/662)
name = "RCTab"
version = "1.4.0-alpha"
version = "1.3.999"
}

jpackage {
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/network/brightspots/rcv/GuiConfigController.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import javafx.concurrent.Task;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.geometry.Insets;
import javafx.scene.Node;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
Expand All @@ -72,6 +73,10 @@
import javafx.scene.control.TextInputDialog;
import javafx.scene.control.cell.CheckBoxTableCell;
import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.layout.Background;
import javafx.scene.layout.BackgroundFill;
import javafx.scene.layout.CornerRadii;
import javafx.scene.paint.Color;
import javafx.stage.DirectoryChooser;
import javafx.stage.FileChooser;
import javafx.stage.FileChooser.ExtensionFilter;
Expand Down Expand Up @@ -124,6 +129,8 @@ public class GuiConfigController implements Initializable {
@FXML
private Label labelCurrentlyLoaded;
@FXML
private Label labelVersion;
@FXML
private TextField textFieldContestName;
@FXML
private TextField textFieldOutputDirectory;
Expand Down Expand Up @@ -858,6 +865,14 @@ private void setWinningRulesDefaultValues() {
}

private void setDefaultValues() {
String versionText = "Running %s version %s".formatted(Main.APP_NAME, Main.APP_VERSION);
if (Main.APP_VERSION.endsWith("999")) {
versionText += " -- this is a development version";
labelVersion.setBackground(new Background(new BackgroundFill(
Color.DARKRED, CornerRadii.EMPTY, Insets.EMPTY)));
labelVersion.setTextFill(Color.WHITE);
}
labelVersion.setText(versionText);
labelCurrentlyLoaded.setText("Currently loaded: <New Config>");

checkBoxCandidateExcluded.setSelected(ContestConfig.SUGGESTED_CANDIDATE_EXCLUDED);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/network/brightspots/rcv/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class Main extends GuiApplication {

// TODO Sync version number with release.yml and build.gradle:
// github.com/BrightSpots/rcv/issues/662
public static final String APP_VERSION = "1.4.0-alpha";
public static final String APP_VERSION = "1.3.999";

/**
* Main entry point to RCTab.
Expand Down
18 changes: 13 additions & 5 deletions src/main/resources/network/brightspots/rcv/GuiConfigLayout.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,19 @@
text="Open Help Manual"/>
</Menu>
</MenuBar>
<Label fx:id="labelCurrentlyLoaded">
<padding>
<Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
</padding>
</Label>
<HBox alignment="CENTER_LEFT">
<Label fx:id="labelCurrentlyLoaded">
<padding>
<Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
</padding>
</Label>
<Region HBox.hgrow="ALWAYS"/>
<Label fx:id="labelVersion" alignment="CENTER_RIGHT" minWidth="200.0">
<padding>
<Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
</padding>
</Label>
</HBox>
</VBox>
</top>
<center>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,2013 Minneapolis Mayor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "2013 Minneapolis Mayor",
"date" : "",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Minneapolis",
"office" : "Mayor"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,2013 Minneapolis Mayor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "2013 Minneapolis Mayor",
"date" : "",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "",
"office" : ""
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Multi-Winner
Contest,2013 Minneapolis Park Board
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "2013 Minneapolis Park Board",
"date" : "",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Minneapolis",
"office" : "Park and Recreation Commissioner"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Multi-Winner
Contest,2013 Minneapolis Park Board
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "2013 Minneapolis Park Board",
"date" : "",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Minneapolis",
"office" : "Park and Recreation Commissioner"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Multi-Winner
Contest,2013 Minneapolis Park Board
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "2013 Minneapolis Park Board",
"date" : "",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Minneapolis",
"office" : "Park and Recreation Commissioner"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Multi-Winner
Contest,2013 Minneapolis Park Board
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "2013 Minneapolis Park Board",
"date" : "",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Minneapolis",
"office" : "Park and Recreation Commissioner"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Multi-Winner
Contest,2013 Minneapolis Park Board
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "2013 Minneapolis Park Board",
"date" : "",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Minneapolis",
"office" : "Park and Recreation Commissioner"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Multi-Winner
Contest,2013 Minneapolis Park Board
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "2013 Minneapolis Park Board",
"date" : "",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Minneapolis",
"office" : "Park and Recreation Commissioner"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,Portland 2015 Mayoral Race
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "Portland 2015 Mayoral Race",
"date" : "2015-11-03",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Portland, ME",
"office" : "Mayor"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,Portland 2015 Mayoral Race
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "Portland 2015 Mayoral Race",
"date" : "2015-11-03",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Portland, ME",
"office" : "Mayor"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,2017 Minneapolis mayoral race
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "2017 Minneapolis mayoral race",
"date" : "2017-11-07",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Minneapolis, MN",
"office" : "Mayor"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,Maine 2018 Democratic Governor Primary race
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "Maine 2018 Democratic Governor Primary race",
"date" : "2018-06-12",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Maine",
"office" : "Governor"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,Aliases test (JSON CDF Format)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "Aliases test (JSON CDF Format)",
"date" : "2023-03-23",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "TestSets_Single_winner",
"office" : "Aliases test"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,Aliases test (ES&S XLSX Format)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "Aliases test (ES&S XLSX Format)",
"date" : "2023-04-28",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "",
"office" : ""
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,Democratic Primary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "Democratic Primary",
"date" : "",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Kansas",
"office" : "Democratic Presidential Primary"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,Portland 2015 Mayoral Race
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "Portland 2015 Mayoral Race",
"date" : "2015-11-03",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Portland, ME",
"office" : "Mayor"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,Continue Until Two + Batch Elimination Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "Continue Until Two + Batch Elimination Test",
"date" : "",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "",
"office" : ""
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,Alaska Dominion test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"config" : {
"contest" : "Alaska Dominion test",
"date" : "2020-07-19",
"generatedBy" : "RCTab 1.4.0-alpha",
"generatedBy" : "RCTab 1.3.999",
"jurisdiction" : "Alaska",
"office" : "Democratic Primary"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Contest Information
Generated By,RCTab 1.4.0-alpha
Generated By,RCTab 1.3.999
CSV Format Version,1
Type of Election,Single-Winner
Contest,Kansas Dominion test
Expand Down
Loading

0 comments on commit 71e347d

Please sign in to comment.