Skip to content

Commit 7ed85f4

Browse files
CiabasCiabas
authored
Merge pull request #3707 from IntersectMBO/develop
GovTool - v2.0.23
2 parents 8032532 + f5a5252 commit 7ed85f4

File tree

88 files changed

+1341
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1341
-433
lines changed

‎.github/scripts/generate_latest_report_redirect.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cat <<EOF > build/index.html
1111
<html lang="en">
1212
<head>
1313
<meta charset="UTF-8">
14-
<meta http-equiv="refresh" content="0; url=/$allure_report_path/$REPORT_NAME/$REPORT_NUMBER#behaviors">
14+
<meta http-equiv="refresh" content="0; url=/$allure_report_path/$GROUP_NAME/$REPORT_NAME/$REPORT_NUMBER#behaviors">
1515
<title>Redirecting...</title>
1616
</head>
1717
</html>

‎.github/scripts/generate_report_details.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/bash
22

3-
if [[ ! -d "gh-pages/$REPORT_NAME" ]]; then
3+
if [[ ! -d "gh-pages/$GROUP_NAME/$REPORT_NAME" ]]; then
44
latest_number=0
55
else
6-
gh_pages_content=$(ls "gh-pages/$REPORT_NAME/")
6+
gh_pages_content=$(ls "gh-pages/$GROUP_NAME/$REPORT_NAME/")
77
latest_number=$(echo "$gh_pages_content" | grep -Eo '[0-9]+' | sort -nr | head -n 1)
88
fi
99

1010
echo "report_number=$((latest_number+1))" >> $GITHUB_OUTPUT
11-
echo "report_url=https://$(dirname "$GH_PAGES").github.io/$(basename "$GH_PAGES")/$REPORT_NAME" >> $GITHUB_OUTPUT
11+
echo "report_url=https://$(dirname "$GH_PAGES").github.io/$(basename "$GH_PAGES")/$GROUP_NAME/$REPORT_NAME" >> $GITHUB_OUTPUT
1212

‎.github/scripts/register_report.sh‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎.github/scripts/remove_oldest_report.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
if [ -d "gh-pages/$REPORT_NAME" ]; then
4-
cd gh-pages/$REPORT_NAME
3+
if [ -d "gh-pages/$GROUP_NAME/$REPORT_NAME" ]; then
4+
cd gh-pages/$GROUP_NAME/$REPORT_NAME
55

66
# Count the number of numerical directories
77
dir_count=$(find . -maxdepth 1 -type d -regex './[0-9]+' | wc -l)

‎.github/scripts/set_commit_status.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ fi
4848

4949
# Determine target URL based on environment
5050
case "$GH_PAGES" in
51-
"IntersectMBO/govtool-test-reports") TARGET_URL="https://intersectmbo.github.io/govtool-test-reports/${REPORT_NAME}/${REPORT_NUMBER}" ;;
52-
"cardanoapi/govtool-test-reports") TARGET_URL="https://cardanoapi.github.io/govtool-test-reports/${REPORT_NAME}/${REPORT_NUMBER}" ;;
53-
*) TARGET_URL="https://intersectmbo.github.io/govtool-test-reports/${REPORT_NAME}/${REPORT_NUMBER}" ;;
51+
"IntersectMBO/govtool-test-reports") TARGET_URL="https://intersectmbo.github.io/govtool-test-reports/${GROUP_NAME}/${REPORT_NAME}/${REPORT_NUMBER}" ;;
52+
"cardanoapi/govtool-test-reports") TARGET_URL="https://cardanoapi.github.io/govtool-test-reports/${GROUP_NAME}/${REPORT_NAME}/${REPORT_NUMBER}" ;;
53+
*) TARGET_URL="https://intersectmbo.github.io/govtool-test-reports/${GROUP_NAME}/${REPORT_NAME}/${REPORT_NUMBER}" ;;
5454
esac
5555

5656
# Determine test result message

‎.github/scripts/set_deployment_environment.sh‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
DEPLOYMENT=${DEPLOYMENT:-"govtool.cardanoapi.io/api"}
4+
GROUP_NAME="qa"
5+
6+
if [[ "$DEPLOYMENT" == "preview.gov.tools" || "$DEPLOYMENT" == "be.preview.gov.tools" || "$DEPLOYMENT" == "z6b8d2f7a-zca4a4c45-gtw.z937eb260.rustrocks.fr" ]]; then
7+
GROUP_NAME="preview"
8+
elif [[ "$DEPLOYMENT" == "gov.tools" || "$DEPLOYMENT" == "be.gov.tools" ]]; then
9+
GROUP_NAME="mainnet"
10+
elif [[ "$DEPLOYMENT" == "p80-z78acf3c2-zded6a792-gtw.z937eb260.rustrocks.fr" || "$DEPLOYMENT" == "z78acf3c2-z5575152b-gtw.z937eb260.rustrocks.fr" ]]; then
11+
GROUP_NAME="dev"
12+
else
13+
GROUP_NAME="qa"
14+
fi
15+
16+
# Set environment variable for GitHub Actions
17+
echo "GROUP_NAME=${GROUP_NAME}" >>$GITHUB_ENV
18+
echo "group_name=${GROUP_NAME}" >>$GITHUB_OUTPUT
19+
echo "Setting deployment environment to: ${GROUP_NAME}"

‎.github/workflows/test_backend.yml‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ on:
3333
workflow_run:
3434
workflows: ["Build and deploy GovTool test stack"]
3535
types: [completed]
36-
branches:
36+
branches:
3737
- test
3838
- infra/test-chores
3939

@@ -59,6 +59,7 @@ jobs:
5959

6060
- name: Set pending commit status
6161
id: set-pending-status
62+
if: ${{ !github.event.schedule }}
6263
run: |
6364
echo "timestamp=$(date +%s)" >> $GITHUB_OUTPUT
6465
curl -X POST -H "Authorization: Bearer ${{ github.token }}" \
@@ -104,6 +105,7 @@ jobs:
104105
needs: backend-tests
105106
outputs:
106107
report_number: ${{ steps.report-details.outputs.report_number }}
108+
group_name: ${{ steps.set-deployment-url.outputs.group_name }}
107109
steps:
108110
- uses: actions/checkout@v4
109111
- name: Download results
@@ -121,27 +123,18 @@ jobs:
121123
repository: ${{vars.GH_PAGES}}
122124
ssh-key: ${{ secrets.DEPLOY_KEY }}
123125

126+
- name: Set Deployment Environment
127+
id: set-deployment-url
128+
run: |
129+
chmod +x .github/scripts/set_deployment_environment.sh
130+
.github/scripts/set_deployment_environment.sh
131+
124132
- name: Remove oldest report to save space
125133
if: ${{success()}}
126134
run: |
127135
chmod +x .github/scripts/remove_oldest_report.sh
128136
.github/scripts/remove_oldest_report.sh
129137
130-
- name: Register report
131-
id: register-project
132-
if: ${{success()}}
133-
run: |
134-
chmod +x .github/scripts/register_report.sh
135-
.github/scripts/register_report.sh
136-
137-
- if: steps.register-project.outputs.project_exists != 'true'
138-
uses: JamesIves/github-pages-deploy-action@v4
139-
with:
140-
ssh-key: ${{ secrets.DEPLOY_KEY }}
141-
repository-name: ${{vars.GH_PAGES}}
142-
branch: gh-pages
143-
folder: project
144-
145138
- name: Generate report details
146139
id: report-details
147140
run: |
@@ -153,7 +146,7 @@ jobs:
153146
id: allure-report
154147
with:
155148
allure_results: allure-results
156-
gh_pages: gh-pages/${{env.REPORT_NAME}}
149+
gh_pages: gh-pages/${{steps.set-deployment-url.outputs.group_name}}/${{env.REPORT_NAME}}
157150
allure_report: allure-report
158151
allure_history: allure-history
159152
keep_reports: 2000
@@ -172,7 +165,7 @@ jobs:
172165
repository-name: ${{vars.GH_PAGES}}
173166
branch: gh-pages
174167
folder: build
175-
target-folder: ${{ env.REPORT_NAME }}
168+
target-folder: ${{steps.set-deployment-url.outputs.group_name}}/${{ env.REPORT_NAME }}
176169

177170
publish-status:
178171
runs-on: ubuntu-latest
@@ -185,8 +178,9 @@ jobs:
185178
with:
186179
name: allure-results
187180
path: allure-results
181+
188182
- name: Set Commit Status
189-
if: always()
183+
if: always() && !github.event.schedule
190184
run: |
191185
chmod +x .github/scripts/set_commit_status.sh
192186
.github/scripts/set_commit_status.sh
@@ -195,9 +189,11 @@ jobs:
195189
TEST_STATUS: ${{ needs.backend-tests.outputs.status }}
196190
REPORT_NUMBER: ${{ needs.publish-report.outputs.report_number }}
197191
GITHUB_TOKEN: ${{ github.token }}
192+
GROUP_NAME: ${{ needs.publish-report.outputs.group_name }}
198193

199194
env:
200195
BASE_URL: https://${{github.event.schedule && 'be.preview.gov.tools' || inputs.deployment || 'govtool.cardanoapi.io/api' }}
196+
DEPLOYMENT: ${{ github.event.schedule && 'be.preview.gov.tools' || inputs.deployment || 'govtool.cardanoapi.io/api'}}
201197
REPORT_NAME: ${{ github.event.schedule && 'nightly-'}}govtool-backend
202198
GH_PAGES: ${{vars.GH_PAGES}}
203199
COMMIT_SHA: ${{ github.event.workflow_run.head_sha || github.sha }}

‎.github/workflows/test_integration_playwright.yml‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ jobs:
5959
with:
6060
ref: ${{ env.COMMIT_SHA }}
6161
- name: Set pending commit status
62+
if: ${{ !github.event.schedule }}
6263
id: set-pending-status
6364
run: |
6465
echo "timestamp=$(date +%s)" >> $GITHUB_OUTPUT
@@ -136,14 +137,15 @@ jobs:
136137
FAUCET_ADDRESS: ${{vars.FAUCET_ADDRESS}}
137138
CARDANOAPI_METADATA_URL: ${{vars.CARDANOAPI_METADATA_URL}}
138139
FAUCET_PAYMENT_PRIVATE: ${{secrets.FAUCET_PAYMENT_PRIVATE}}
139-
FAUCET_STAKE_PKH: ${{secrets.FAUCET_STAKE_PKH}}
140+
FAUCET_STAKE_PRIVATE: ${{secrets.FAUCET_STAKE_PRIVATE}}
140141

141142
publish-report:
142143
runs-on: ubuntu-latest
143144
if: always() && needs.integration-tests.result != 'skipped'
144145
needs: integration-tests
145146
outputs:
146147
report_number: ${{ steps.report-details.outputs.report_number }}
148+
group_name: ${{ steps.set-deployment-url.outputs.group_name }}
147149
steps:
148150
- uses: actions/checkout@v4
149151
- name: Download report
@@ -161,27 +163,18 @@ jobs:
161163
repository: ${{vars.GH_PAGES}}
162164
ssh-key: ${{ secrets.DEPLOY_KEY }}
163165

166+
- name: Set Deployment Environment
167+
id: set-deployment-url
168+
run: |
169+
chmod +x .github/scripts/set_deployment_environment.sh
170+
.github/scripts/set_deployment_environment.sh
171+
164172
- name: Remove oldest report to save space
165173
if: ${{success()}}
166174
run: |
167175
chmod +x .github/scripts/remove_oldest_report.sh
168176
.github/scripts/remove_oldest_report.sh
169177
170-
- name: Register report
171-
id: register-project
172-
if: ${{success()}}
173-
run: |
174-
chmod +x .github/scripts/register_report.sh
175-
.github/scripts/register_report.sh
176-
177-
- if: steps.register-project.outputs.project_exists != 'true'
178-
uses: JamesIves/github-pages-deploy-action@v4
179-
with:
180-
ssh-key: ${{ secrets.DEPLOY_KEY }}
181-
repository-name: ${{vars.GH_PAGES}}
182-
branch: gh-pages
183-
folder: project
184-
185178
- name: Generate report details
186179
id: report-details
187180
run: |
@@ -194,7 +187,7 @@ jobs:
194187
id: allure-report
195188
with:
196189
allure_results: allure-results
197-
gh_pages: gh-pages/${{env.REPORT_NAME}}
190+
gh_pages: gh-pages/${{steps.set-deployment-url.outputs.group_name}}/${{env.REPORT_NAME}}
198191
allure_report: allure-report
199192
allure_history: allure-history
200193
keep_reports: 2000
@@ -213,7 +206,7 @@ jobs:
213206
repository-name: ${{vars.GH_PAGES}}
214207
branch: gh-pages
215208
folder: build
216-
target-folder: ${{ env.REPORT_NAME }}
209+
target-folder: ${{steps.set-deployment-url.outputs.group_name}}/${{ env.REPORT_NAME }}
217210

218211
publish-status:
219212
runs-on: ubuntu-latest
@@ -226,8 +219,9 @@ jobs:
226219
with:
227220
name: allure-results
228221
path: allure-results
222+
229223
- name: Set Commit Status
230-
if: always()
224+
if: always() && !github.event.schedule
231225
run: |
232226
chmod +x .github/scripts/set_commit_status.sh
233227
.github/scripts/set_commit_status.sh
@@ -236,8 +230,10 @@ jobs:
236230
TEST_STATUS: ${{ needs.integration-tests.outputs.status }}
237231
REPORT_NUMBER: ${{ needs.publish-report.outputs.report_number }}
238232
GITHUB_TOKEN: ${{ github.token }}
233+
GROUP_NAME: ${{ needs.publish-report.outputs.group_name }}
239234
env:
240235
HOST_URL: https://${{ github.event.schedule && 'preview.gov.tools' || (inputs.deployment || 'govtool.cardanoapi.io') }}
236+
DEPLOYMENT: ${{ github.event.schedule && 'preview.gov.tools' || inputs.deployment || 'govtool.cardanoapi.io'}}
241237
REPORT_NAME: ${{ github.event.schedule && 'nightly-'}}govtool-frontend
242238
GH_PAGES: ${{vars.GH_PAGES}}
243239
COMMIT_SHA: ${{ github.event.workflow_run.head_sha || github.sha }}

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,29 @@ changes.
1212

1313
### Added
1414

15+
- Preserve maintenance ending banner state on the wallet connection change [Issue 3681](https://github.com/IntersectMBO/govtool/issues/3681)
16+
17+
### Fixed
18+
19+
- Fix missing off chain references in DRep details [Issue 3490](https://github.com/IntersectMBO/govtool/issues/3490)
20+
21+
### Changed
22+
23+
### Removed
24+
25+
## [v2.0.23](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.23) 2025-05-22
26+
27+
### Added
28+
29+
- Add CIP-129 support for gov_actions hashes in Live Voting (governance actions) [Issue 3619](https://github.com/IntersectMBO/govtool/issues/3619)
30+
1531
- Add maintenance ending banner [Issue 3647](https://github.com/IntersectMBO/govtool/issues/3647)
32+
- Add support for the Protocol Parameter Change and Hard Fork Initiation governance actions
1633

1734
### Fixed
1835

36+
- Fix displaying proposals title in details page [Issue 3192](https://github.com/IntersectMBO/govtool/issues/3192)
37+
1938
### Changed
2039

2140
### Removed

‎gov-action-loader/frontend/src/App.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ export default {
7070
data() {
7171
return {
7272
tab: null,
73-
selectedNetwork: 'Sanchonet', // Default selection
74-
networkOptions: ['Sanchonet', 'Preview', 'Preprod'],
73+
selectedNetwork: 'Preview', // Default selection
74+
networkOptions: ['Preview', 'Preprod'],
7575
walletInfo: {
7676
address: null,
7777
balance: null,

0 commit comments

Comments
 (0)