From 03d207bd734cdb1275bd0fc2100c4bb8fb2e0fba Mon Sep 17 00:00:00 2001 From: Eduardo Robles Elvira Date: Mon, 5 Sep 2022 15:29:16 +0200 Subject: [PATCH] Release for version 7.0.0-beta.1 --- config.yml | 8 ++++---- doc/devel/auth1.config.yml | 6 +++--- doc/devel/auth2.config.yml | 6 +++--- doc/devel/sequent.config.yml | 6 +++--- doc/production/config.auth.yml | 6 +++--- doc/production/config.master.yml | 6 +++--- helper-tools/config_prod_env.py | 6 +++--- repos.yml | 26 +++++++++++++------------- sequent-ui/templates/SequentConfig.js | 2 +- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/config.yml b/config.yml index 73cf7b58..990fd7a3 100644 --- a/config.yml +++ b/config.yml @@ -26,7 +26,7 @@ params: # global configuration config: backup_password: '' - version: 'master' + version: '7.0.0-beta.1' # global config. Note: currently some other keys are used as global conf global_secret_key: '' @@ -510,7 +510,7 @@ config: # Main version shown in the user interface. set to 'false' if you don't # want it to be shown. - mainVersion: 'master' + mainVersion: '7.0.0-beta.1' # Login session cookies expiration in minutes. set to 'false' to be # unlimited. Does not apply to admin-console cookies (which use the value @@ -659,7 +659,7 @@ config: # default configuration for calculate results on admin-console calculate_results_default: >- { - "version": "master", + "version": "7.0.0-beta.1", "pipes": [ { "type": "tally_pipes.pipes.pdf.configure_pdf", @@ -695,7 +695,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, tallyPipesConfig: { - version: 'master', + version: '7.0.0-beta.1', pipes: [ { type: 'tally_pipes.pipes.results.do_tallies', diff --git a/doc/devel/auth1.config.yml b/doc/devel/auth1.config.yml index 2824db00..52ec2c29 100644 --- a/doc/devel/auth1.config.yml +++ b/doc/devel/auth1.config.yml @@ -25,7 +25,7 @@ params: # global configuration config: - version: 'master' + version: '7.0.0-beta.1' backup_password: '' # global config. Note: currently some other keys are used as global conf @@ -647,7 +647,7 @@ config: # default configuration for calculate results on admin-console calculate_results_default: >- { - "version": "master", + "version": "7.0.0-beta.1", "pipes": [ { "type": "tally_pipes.pipes.pdf.configure_pdf", @@ -683,7 +683,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, tallyPipesConfig: { - version: 'master', + version: '7.0.0-beta.1', pipes: [ { type: 'tally_pipes.pipes.results.do_tallies', diff --git a/doc/devel/auth2.config.yml b/doc/devel/auth2.config.yml index 4292556d..7510f45d 100644 --- a/doc/devel/auth2.config.yml +++ b/doc/devel/auth2.config.yml @@ -25,7 +25,7 @@ params: # global configuration config: - version: 'master' + version: '7.0.0-beta.1' backup_password: '' # global config. Note: currently some other keys are used as global conf @@ -654,7 +654,7 @@ config: # default configuration for calculate results on admin-console calculate_results_default: >- { - "version": "master", + "version": "7.0.0-beta.1", "pipes": [ { "type": "tally_pipes.pipes.pdf.configure_pdf", @@ -690,7 +690,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, tallyPipesConfig: { - version: 'master', + version: '7.0.0-beta.1', pipes: [ { type: 'tally_pipes.pipes.results.do_tallies', diff --git a/doc/devel/sequent.config.yml b/doc/devel/sequent.config.yml index 0f32392b..39e11510 100644 --- a/doc/devel/sequent.config.yml +++ b/doc/devel/sequent.config.yml @@ -25,7 +25,7 @@ params: # global configuration config: - version: 'master' + version: '7.0.0-beta.1' backup_password: '' # global config. Note: currently some other keys are used as global conf @@ -661,7 +661,7 @@ config: # default configuration for calculate results on admin-console calculate_results_default: >- { - "version": "master", + "version": "7.0.0-beta.1", "pipes": [ { "type": "tally_pipes.pipes.pdf.configure_pdf", @@ -697,7 +697,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, tallyPipesConfig: { - version: 'master', + version: '7.0.0-beta.1', pipes: [ { type: 'tally_pipes.pipes.results.do_tallies', diff --git a/doc/production/config.auth.yml b/doc/production/config.auth.yml index 112d3ed1..652b6210 100644 --- a/doc/production/config.auth.yml +++ b/doc/production/config.auth.yml @@ -25,7 +25,7 @@ params: # global configuration config: - version: 'master' + version: '7.0.0-beta.1' backup_password: '' # global config. Note: currently some other keys are used as global conf @@ -654,7 +654,7 @@ config: # default configuration for calculate results on admin-console calculate_results_default: >- { - "version": "master", + "version": "7.0.0-beta.1", "pipes": [ { "type": "tally_pipes.pipes.pdf.configure_pdf", @@ -690,7 +690,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, tallyPipesConfig: { - version: 'master', + version: '7.0.0-beta.1', pipes: [ { type: 'tally_pipes.pipes.results.do_tallies', diff --git a/doc/production/config.master.yml b/doc/production/config.master.yml index cbe99ed6..5efd8f15 100644 --- a/doc/production/config.master.yml +++ b/doc/production/config.master.yml @@ -25,7 +25,7 @@ params: # global configuration config: - version: 'master' + version: '7.0.0-beta.1' backup_password: '' # global config. Note: currently some other keys are used as global conf @@ -654,7 +654,7 @@ config: # default configuration for calculate results on admin-console calculate_results_default: >- { - "version": "master", + "version": "7.0.0-beta.1", "pipes": [ { "type": "tally_pipes.pipes.pdf.configure_pdf", @@ -690,7 +690,7 @@ config: layout: 'simple', num_successful_logins_allowed: 0, tallyPipesConfig: { - version: 'master', + version: '7.0.0-beta.1', pipes: [ { type: 'tally_pipes.pipes.results.do_tallies', diff --git a/helper-tools/config_prod_env.py b/helper-tools/config_prod_env.py index 75d9ce7b..47ba8918 100755 --- a/helper-tools/config_prod_env.py +++ b/helper-tools/config_prod_env.py @@ -21,9 +21,9 @@ import argparse import re -INPUT_PROD_VERSION="4.0.0" -INPUT_PRE_VERSION="master" -OUTPUT_PROD_VERSION="master" +INPUT_PROD_VERSION="master" +INPUT_PRE_VERSION="7.0.0-beta.1" +OUTPUT_PROD_VERSION="7.0.0-beta.1" def store_keyvalue(prod_config, generated_config, keystore, pipe): ''' Updates the keyvalue store diff --git a/repos.yml b/repos.yml index a46ae436..c5f74d08 100644 --- a/repos.yml +++ b/repos.yml @@ -17,53 +17,53 @@ repos: ballot_box: repo: https://github.com/sequentech/ballot-box.git - version: 'master' + version: '7.0.0-beta.1' force: yes results: repo: https://github.com/sequentech/tally-pipes.git - version: 'master' + version: '7.0.0-beta.1' force: yes tally: repo: https://github.com/sequentech/tally-methods.git - version: 'master' + version: '7.0.0-beta.1' force: yes iam: repo: https://github.com/sequentech/iam.git - version: 'master' + version: '7.0.0-beta.1' force: yes misc_tools: repo: https://github.com/sequentech/misc-tools.git - version: 'master' + version: '7.0.0-beta.1' force: yes frestq: repo: https://github.com/sequentech/frestq - version: 'master' + version: '7.0.0-beta.1' force: yes eorchestra: repo: https://github.com/sequentech/election-orchestra - version: 'master' + version: '7.0.0-beta.1' force: yes mixnet: repo: https://github.com/sequentech/mixnet - version: 'master' + version: '7.0.0-beta.1' force: yes election_verifier: repo: https://github.com/sequentech/election-verifier.git - version: 'master' + version: '7.0.0-beta.1' force: yes common_ui: repo: https://github.com/sequentech/common-ui.git - version: 'master' + version: '7.0.0-beta.1' force: yes admin_console: repo: https://github.com/sequentech/admin-console.git - version: 'master' + version: '7.0.0-beta.1' force: yes voting_booth: repo: https://github.com/sequentech/voting-booth.git - version: 'master' + version: '7.0.0-beta.1' force: yes election_portal: repo: https://github.com/sequentech/election-portal.git - version: 'master' + version: '7.0.0-beta.1' force: yes diff --git a/sequent-ui/templates/SequentConfig.js b/sequent-ui/templates/SequentConfig.js index 7d330590..a9044fd0 100644 --- a/sequent-ui/templates/SequentConfig.js +++ b/sequent-ui/templates/SequentConfig.js @@ -20,7 +20,7 @@ * in this same file, which you might want to edit and tune if needed. */ -var SEQUENT_CONFIG_VERSION = 'master'; +var SEQUENT_CONFIG_VERSION = '7.0.0-beta.1'; var SequentConfigData = { // the base url path for ajax requests, for example for sending ballots or