Skip to content

Commit 1297791

Browse files
authored
Merge pull request #1971 from aeternity/release/13.3.0
Release v13.3.0
2 parents 7126ad0 + 1ffaeff commit 1297791

File tree

156 files changed

+8930
-5148
lines changed

Some content is hidden

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

156 files changed

+8930
-5148
lines changed

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@v2
30+
uses: github/codeql-action/init@v3
3131
with:
3232
languages: ${{ matrix.language }}
3333
queries: +security-and-quality
3434

3535
- name: Autobuild
36-
uses: github/codeql-action/autobuild@v2
36+
uses: github/codeql-action/autobuild@v3
3737

3838
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@v2
39+
uses: github/codeql-action/analyze@v3
4040
with:
4141
category: "/language:${{ matrix.language }}"

.github/workflows/docs-develop.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ jobs:
88
main:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 0
14-
- uses: actions/setup-python@v4
14+
- uses: actions/setup-python@v5
1515
with:
16-
python-version: 3.11
17-
- uses: actions/cache@v3
16+
python-version: 3.12
17+
- uses: actions/cache@v4
1818
with:
1919
path: ~/.cache/pip3
2020
key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
21-
- uses: actions/cache@v3
21+
- uses: actions/cache@v4
2222
with:
2323
path: |
2424
~/.npm

.github/workflows/docs-release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ jobs:
77
main:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111
with:
1212
fetch-depth: 0
13-
- uses: actions/setup-python@v4
13+
- uses: actions/setup-python@v5
1414
with:
15-
python-version: 3.11
16-
- uses: actions/cache@v3
15+
python-version: 3.12
16+
- uses: actions/cache@v4
1717
with:
1818
path: ~/.cache/pip3
1919
key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
20-
- uses: actions/cache@v3
20+
- uses: actions/cache@v4
2121
with:
2222
path: |
2323
~/.npm

.github/workflows/main.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
name: Test & build
2-
on: [pull_request]
2+
on:
3+
push:
4+
branches: [master, develop]
5+
pull_request:
36
jobs:
47
main:
58
runs-on: ubuntu-22.04
69
steps:
710
- run: |
811
wget -q https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_25.0.4-1~ubuntu~jammy_amd64.deb
912
sudo apt install --allow-downgrades ./esl-erlang_25.0.4-1~ubuntu~jammy_amd64.deb
10-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1114
with:
1215
fetch-depth: 100
13-
- uses: actions/setup-node@v3
16+
- uses: actions/setup-node@v4
1417
with:
15-
node-version: 18.x
16-
- uses: actions/cache@v3
18+
node-version: 20.x
19+
- uses: actions/cache@v4
1720
with:
1821
path: |
1922
~/.npm
@@ -27,16 +30,15 @@ jobs:
2730
BASE: ${{ github.event.pull_request.base.sha }}
2831
run: npx commitlint --from $BASE --to $HEAD --verbose
2932
- run: npm run lint
30-
- run: docker-compose up -d
31-
- name: Ensure that node is running
32-
run: |
33-
while [[ `curl -s -o /dev/null -w %{http_code} localhost:3013/api` != 200 ]]; do
34-
sleep 0.2;
35-
done
36-
- run: npx nyc npm run test
33+
# TODO: remove after merging https://github.com/aeternity/aeternity/pull/4319
34+
- run: chmod 666 ./docker/accounts-pub.json
35+
- run: docker compose up -d --wait
36+
- run: npx nyc npm test
3737
- run: npx nyc report --reporter=text-lcov > coverage.lcov
38-
- uses: codecov/codecov-action@v3
38+
- uses: codecov/codecov-action@v4
3939
with:
4040
files: coverage.lcov
41-
- run: docker-compose logs
41+
env:
42+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
43+
- run: docker compose logs
4244
if: always()

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ coverage.*
2929
site
3030
/src/apis/
3131
/src/tx/builder/schema.generated.ts
32+
/src/tx/builder/delegation/schema.generated.ts
3233
/tooling/autorest/compiler-swagger.yaml
3334
/tooling/autorest/middleware-openapi.yaml
3435
/test/environment/ledger/browser

.mocharc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = {
22
require: 'tooling/babel-register.js',
33
recursive: true,
44
extension: '.js,.ts',
5-
timeout: '40s',
5+
timeout: process.env.NETWORK ? '500s' : '40s',
66
ignore: 'test/environment/**',
77
exit: true // TODO: fix in state channel tests
88
}

.readthedocs.yml

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

AUTHORS

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

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ISC License (ISC)
2-
Copyright © 2022 aeternity developers
2+
Copyright © 2024 aeternity developers
33

44
Permission to use, copy, modify, and/or distribute this software for any purpose
55
with or without fee is hereby granted, provided that the above copyright notice

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ We keep our [Changelog](docs/CHANGELOG.md) up to date.
5252
## License
5353

5454
ISC License (ISC)
55-
Copyright © 2023 æternity developers
55+
Copyright © 2024 æternity developers
5656

5757
Permission to use, copy, modify, and/or distribute this software for any purpose
5858
with or without fee is hereby granted, provided that the above copyright notice

0 commit comments

Comments
 (0)