Skip to content

Commit e6d32f3

Browse files
authored
Merge branch 'main' into typo-fix
2 parents 0e99fbb + c7e6058 commit e6d32f3

File tree

93 files changed

+2347
-297
lines changed

Some content is hidden

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

93 files changed

+2347
-297
lines changed
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: 🐞 Bug
2+
description: File a bug/issue
3+
title: "bug: "
4+
labels: [bug]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
_The more information you share, the faster we can help you._
10+
Prior to opening the issue, please make sure that you:
11+
- Use English (EN/US) to communicate.
12+
- Search the [open issues](https://github.com/hyperledger/firefly/issues) to avoid duplicating the issue.
13+
14+
- type: textarea
15+
id: problem
16+
attributes:
17+
label: What happened?
18+
description: |
19+
Please provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner.
20+
If this matter is security related, please disclose it privately via [email protected]
21+
validations:
22+
required: true
23+
24+
- type: textarea
25+
id: expected
26+
attributes:
27+
label: What did you expect to happen?
28+
validations:
29+
required: true
30+
31+
- type: textarea
32+
id: repro
33+
attributes:
34+
label: How can we reproduce it (as minimally and precisely as possible)?
35+
validations:
36+
required: true
37+
38+
- type: textarea
39+
id: additional
40+
attributes:
41+
label: Anything else we need to know?
42+
43+
- type: textarea
44+
id: osVersion
45+
attributes:
46+
label: OS version
47+
value: |
48+
<details>
49+
50+
```console
51+
# On Linux:
52+
$ cat /etc/os-release
53+
# paste output here
54+
$ uname -a
55+
# paste output here
56+
57+
# On Windows:
58+
C:\> wmic os get Caption, Version, BuildNumber, OSArchitecture
59+
# paste output here
60+
```
61+
62+
</details>

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Support Request
4+
url: https://discord.gg/hyperledger
5+
about: Support request or question relating to Hyperledger Firefly
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Enhancement Tracking Issue
2+
description: Provide supporting details for an enhancement
3+
labels: [enhancement]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
_The more information you share, the faster we can help you._
9+
Prior to opening the issue, please make sure that you:
10+
- Use English (EN/US) to communicate.
11+
- Search the [open issues](https://github.com/hyperledger/firefly/issues) to avoid duplicating the issue.
12+
13+
- type: textarea
14+
id: enhancement
15+
attributes:
16+
label: What would you like to be added?
17+
description: |
18+
A clear and concise description of what you want to happen.
19+
validations:
20+
required: true
21+
22+
- type: textarea
23+
id: rationale
24+
attributes:
25+
label: Why is this needed?
26+
validations:
27+
required: true
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: "Documentation Issue"
2+
description: Issues related to documentation.
3+
title: "docs: "
4+
labels: [documentation]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
_The more information you share, the faster we can help you._
10+
Prior to opening the issue, please make sure that you:
11+
- Use English (EN/US) to communicate.
12+
- Search the [open issues](https://github.com/hyperledger/firefly/issues) to avoid duplicating the issue.
13+
14+
- type: textarea
15+
id: current-state
16+
attributes:
17+
label: Current State
18+
description: Describe the current state of the documentation.
19+
placeholder: |
20+
The documentation for the API in this page (url) is missing ...
21+
validations:
22+
required: true
23+
- type: textarea
24+
id: desired-state
25+
attributes:
26+
label: Desired State
27+
description: Describe the desired state the documentation should be in.
28+
placeholder: |
29+
Add here ...
30+
validations:
31+
required: true

.github/pull_request_template.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<!-- Thanks for sending a pull request! -->
2+
3+
## Proposed changes
4+
5+
Please include a summary of the changes here and why we need those changes. And also let us know which issue is fixed.
6+
7+
Fixes # <issue_number_here>
8+
9+
<hr>
10+
11+
## Types of changes
12+
13+
<!-- to mark a point done, place an x in square brackets. eg [x]-->
14+
<!-- - [x] done with this task-->
15+
<!----Please delete options that are not relevant. And in order to tick the check box just but x inside them for example [x] like this----->
16+
17+
- [ ] Bug fix
18+
- [ ] New feature added
19+
- [ ] Documentation Update
20+
21+
<hr>
22+
23+
## Please make sure to follow these points
24+
25+
<!-- to mark a point done, place an x in square brackets. eg [x]-->
26+
<!-- - [x] done with this task-->
27+
<!----Please delete options that are not relevant. And in order to tick the check box just but x inside them for example [x] like this----->
28+
29+
- [ ] I have read the contributing guidelines.
30+
- [ ] I have performed a self-review of my own code or work.
31+
- [ ] I have commented my code, particularly in hard-to-understand areas.
32+
- [ ] My changes generates no new warnings.
33+
- [ ] My Pull Request title is in format <code>< issue name ></code> eg <code>Added links in the documentation</code>.
34+
- [ ] I have added tests that prove my fix is effective or that my feature works.
35+
- [ ] My changes have sufficient code coverage (unit, integration, e2e tests).
36+
37+
<hr>
38+
39+
## Screenshots (If Applicable)
40+
41+
<hr>
42+
43+
44+
## Other Information
45+
46+
Any message for the reviewer or kick off the discussion by explaining why you considered this particular solution, any alternatives etc.

.github/workflows/docker_main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ on:
44
push:
55
branches:
66
- main
7+
paths-ignore:
8+
- '.github/**' # exclude .github directory
9+
- '**.md' # exclude all markdown files
710

811
jobs:
912
docker:
1013
runs-on: ubuntu-latest
14+
permissions:
15+
contents: read
16+
packages: write
1117
steps:
1218
- uses: actions/checkout@v3
1319
with:

.github/workflows/docker_release.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,25 @@ on:
55
types: [released, prereleased]
66

77
jobs:
8+
89
docker:
910
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
packages: write
1014
steps:
11-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1216
with:
1317
fetch-depth: 0
1418

19+
- name: Get the latest tag
20+
id: get_latest_tag
21+
run: |
22+
git fetch --tags
23+
latest_tag=$(git tag -l | sort -V | tail -n 1)
24+
echo "latest tag: $latest_tag"
25+
echo "LATEST_TAG=$latest_tag" >> $GITHUB_ENV
26+
1527
- name: Set up QEMU
1628
uses: docker/setup-qemu-action@v2
1729

@@ -25,9 +37,9 @@ jobs:
2537
registry: ghcr.io
2638
username: ${{ github.actor }}
2739
password: ${{ secrets.GITHUB_TOKEN }}
28-
40+
2941
- name: Set latest tag
30-
if: github.event.action == 'released'
42+
if: github.event.action == 'released' && github.ref_name == env.LATEST_TAG
3143
run: |
3244
echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository }}:latest" >> $GITHUB_ENV
3345

.github/workflows/docs.yml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,24 @@ jobs:
2323
git config --global user.name "GitHub Actions"
2424
git config --global user.email "[email protected]"
2525
26-
- name: Check if this is the latest release
26+
- name: Get the latest tag
2727
run: |
28-
LATEST_TAG=$(
29-
curl -L \
30-
-H "Accept: application/vnd.github+json" \
31-
-H "Authorization: Bearer ${{ github.token }}" \
32-
-H "X-GitHub-Api-Version: 2022-11-28" \
33-
https://api.github.com/repos/${{ github.repository }}/releases/latest \
34-
| jq -r '.tag_name'
35-
)
36-
IS_LATEST=${{ env.LATEST_TAG == github.event.release.tag_name }}
37-
echo This release is: "${{ github.event.release.tag_name }}"
38-
echo The latest release is: "$LATEST_TAG"
39-
echo "IS_LATEST_RELEASE=$IS_LATEST" >> "$GITHUB_ENV"
28+
git fetch --tags
29+
latest_tag=$(git tag -l | sort -V | grep -v "rc" | tail -n 1)
30+
echo "latest tag: $latest_tag"
31+
echo "LATEST_TAG=$latest_tag" >> $GITHUB_ENV
4032
4133
- name: Install docs dependencies
4234
working-directory: doc-site
4335
run: pip install -r requirements.txt
4436

4537
- name: Update doc site for release
46-
if: ${{ github.event_name == 'release' && env.IS_LATEST_RELEASE != 'true' }}
38+
if: github.event.action == 'released' && github.ref_name != env.LATEST_TAG
4739
working-directory: doc-site
4840
run: mike deploy ${{ github.event.release.tag_name }} --push
4941

5042
- name: Update doc site for latest release
51-
if: ${{ github.event_name == 'release' && env.IS_LATEST_RELEASE == 'true' }}
43+
if: github.event.action == 'released' && github.ref_name == env.LATEST_TAG
5244
working-directory: doc-site
5345
run: mike deploy ${{ github.event.release.tag_name }} latest -u --push
5446

.github/workflows/go.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,19 @@ name: Go
33
on:
44
push:
55
branches: [main]
6+
paths:
7+
- '**' # include all files
8+
- '!.github/**' # exclude .github directory
9+
- '!**.md' # exclude all markdown files
10+
- 'doc-site/docs/reference/**.md' # include markdown files that are auto generated and need to be tested
11+
612
pull_request:
7-
branches: [main]
13+
paths:
14+
- '**' # include all files
15+
- '!.github/**' # exclude .github directory
16+
- '!**.md' # exclude all markdown files
17+
- 'doc-site/docs/reference/**.md' # include markdown files that are auto generated and need to be tested
18+
819
workflow_dispatch:
920

1021
jobs:
@@ -20,7 +31,7 @@ jobs:
2031
- name: Set up Go
2132
uses: actions/setup-go@v4
2233
with:
23-
go-version: 1.21
34+
go-version: 1.22
2435

2536
- name: Build and Test
2637
run: make
@@ -40,7 +51,7 @@ jobs:
4051
- name: Set up Go
4152
uses: actions/setup-go@v4
4253
with:
43-
go-version: 1.21
54+
go-version: 1.22
4455

4556
- name: Build Docker image
4657
run: make docker
@@ -49,7 +60,7 @@ jobs:
4960
run: docker save --output firefly.tar.gz hyperledger/firefly
5061

5162
- name: Upload Docker image
52-
uses: actions/upload-artifact@v3
63+
uses: actions/upload-artifact@v4
5364
with:
5465
name: firefly-docker
5566
path: firefly.tar.gz
@@ -132,10 +143,10 @@ jobs:
132143
- name: Set up Go
133144
uses: actions/setup-go@v4
134145
with:
135-
go-version: 1.21
146+
go-version: 1.22
136147

137148
- name: Download Docker image
138-
uses: actions/download-artifact@v3
149+
uses: actions/download-artifact@v4
139150
with:
140151
name: firefly-docker
141152

@@ -154,7 +165,7 @@ jobs:
154165
run: ./test/e2e/run.sh
155166

156167
- name: Archive container logs
157-
uses: actions/upload-artifact@v3
168+
uses: actions/upload-artifact@v4
158169
if: always()
159170
with:
160171
name: container-logs-${{ matrix.test-suite }}-${{ matrix.blockchain-provider }}-${{ matrix.blockchain-connector }}-${{ matrix.database-type }}-${{ matrix.token-provider }}

.github/workflows/integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Set up Go
5555
uses: actions/setup-go@v4
5656
with:
57-
go-version: 1.21
57+
go-version: 1.22
5858

5959
- name: Update manifest to latest commit for every service
6060
run: ./manifestgen.sh head
@@ -75,7 +75,7 @@ jobs:
7575
run: ./test/e2e/run.sh
7676

7777
- name: Archive container logs
78-
uses: actions/upload-artifact@v3
78+
uses: actions/upload-artifact@v4
7979
if: always()
8080
with:
8181
name: container-logs-${{ matrix.test-suite }}-${{ matrix.blockchain-node }}-${{ matrix.database-type }}
@@ -91,7 +91,7 @@ jobs:
9191
- name: Set up Go
9292
uses: actions/setup-go@v4
9393
with:
94-
go-version: 1.21
94+
go-version: 1.22
9595

9696
- name: Update manifest to latest commit for every service
9797
run: ./manifestgen.sh head
@@ -111,7 +111,7 @@ jobs:
111111
run: ./test/e2e/run.sh
112112

113113
- name: Archive container logs
114-
uses: actions/upload-artifact@v3
114+
uses: actions/upload-artifact@v4
115115
if: always()
116116
with:
117117
name: container-logs-TestEthereumV1MigrationE2ESuite-geth-postgres

0 commit comments

Comments
 (0)