Skip to content

Commit

Permalink
Merge branch 'develop' into feat/improve-web-api
Browse files Browse the repository at this point in the history
  • Loading branch information
jkrvivian committed Apr 17, 2023
2 parents 2fa3dac + a872d7d commit e06f59b
Show file tree
Hide file tree
Showing 746 changed files with 25,173 additions and 39,034 deletions.
3 changes: 2 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ tools/

# Database directory
mainnetdb/
db/
retainer/

plugins/dashboard/frontend/node_modules/
plugins/analysis/dashboard/frontend/node_modules/
plugins/dagsvisualizer/frontend/node_modules/
documentation/
images/
13 changes: 8 additions & 5 deletions .github/workflows/client-import.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Setup Go 1.19.4
uses: actions/setup-go@v1
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup Go 1.20
uses: actions/setup-go@v3
with:
go-version: 1.19.4
go-version: 1.20

- name: Checkout repository
uses: actions/checkout@v2
- name: Print Go version
run: go version

- name: Run Import Check Script
run: ./scripts/client_import_check.sh
2 changes: 1 addition & 1 deletion .github/workflows/docker-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
DOCKER_BUILDKIT: 1
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Publish to Docker Hub
uses: docker/build-push-action@92e71463491f2d026a477188b8ad3a0fdd9d672c
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/feature-network-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
DOCKER_BUILDKIT: 1
steps:
- name: Checkout repository
uses: actions/checkout@v2.3.4
uses: actions/checkout@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1.3.0
uses: docker/setup-buildx-action@v2

- name: Cache Docker layers
uses: actions/cache@v3
Expand All @@ -32,13 +32,13 @@ jobs:
${{ runner.os }}-buildx-
- name: Login to DockerHub
uses: docker/login-action@v1.9.0
uses: docker/login-action@v2
with:
username: '${{ secrets.IOTALEDGERTESTING_HUB_DOCKER_LOGIN }}'
password: '${{ secrets.IOTALEDGERTESTING_HUB_DOCKER_PASSWORD }}'

- name: Publish to Docker Hub
uses: docker/build-push-action@v2.5.0
uses: docker/build-push-action@v3
with:
tags: iotaledgertesting/goshimmer:feature
push: true
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/goreleaser-dryrun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@ jobs:
runs-on:
- ubuntu-latest
container:
image: iotaledger/goreleaser-cgo-cross-compiler:1.19.4
volumes: [/repo]
image: iotaledger/goreleaser-cgo-cross-compiler:1.20.1
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- run: git config --system --add safe.directory /__w/goshimmer/goshimmer

- name: Create fake config.json and snapshot.bin
run: touch config.json snapshot.bin

- name: Run GoReleaser
run: goreleaser --snapshot --rm-dist
run: goreleaser --snapshot --clean
shell: bash
14 changes: 7 additions & 7 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache Go modules for tester container
uses: actions/cache@v3
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
steps:

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache Go modules for tester container
uses: actions/cache@v3
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
steps:

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache Go modules for tester container
uses: actions/cache@v3
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
steps:

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache Go modules for tester container
uses: actions/cache@v3
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
steps:

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache Go modules for tester container
uses: actions/cache@v3
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
steps:

- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache Go modules for tester container
uses: actions/cache@v3
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
steps:

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache Go modules for tester container
uses: actions/cache@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pre-devnet-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
DOCKER_BUILDKIT: 1
steps:
- name: Checkout repository
uses: actions/checkout@v2.3.4
uses: actions/checkout@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1.3.0
uses: docker/setup-buildx-action@v2

- name: Cache Docker layers
uses: actions/cache@v3
Expand All @@ -29,13 +29,13 @@ jobs:
${{ runner.os }}-buildx-
- name: Login to DockerHub
uses: docker/login-action@v1.9.0
uses: docker/login-action@v2
with:
username: '${{ secrets.IOTALEDGER_HUB_DOCKER_LOGIN }}'
password: '${{ secrets.IOTALEDGER_HUB_DOCKER_PASSWORD }}'

- name: Publish to Docker Hub
uses: docker/build-push-action@v2.5.0
uses: docker/build-push-action@v3
with:
tags: iotaledger/goshimmer:develop
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rebuild-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: "refs/tags/${{github.event.inputs.tagName}}"
- name: Publish to Docker Hub
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Create Git tag
run: |
Expand All @@ -31,22 +31,23 @@ jobs:
runs-on:
- ubuntu-latest
container:
image: iotaledger/goreleaser-cgo-cross-compiler:1.19
volumes: [/repo]
image: iotaledger/goreleaser-cgo-cross-compiler:1.20.1
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: "refs/tags/${{github.event.inputs.tagName}}"

- run: git config --system --add safe.directory /__w/goshimmer/goshimmer

- name: Copy config.default.json to config.json
run: cp config.default.json config.json

- name: Download latest snapshot file
run: wget -O snapshot.bin https://dbfiles-goshimmer.s3.eu-central-1.amazonaws.com/snapshots/nectar/snapshot-latest.bin

- name: Run GoReleaser
run: goreleaser --rm-dist --release-notes <(echo "${{ github.event.inputs.releaseDescription }}")
run: goreleaser --clean --release-notes <(echo "${{ github.event.inputs.releaseDescription }}")
shell: bash
env:
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
Expand All @@ -59,7 +60,7 @@ jobs:
- ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: "refs/tags/${{github.event.inputs.tagName}}"
- name: Publish to Docker Hub
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/reviewdog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ jobs:
- name: Run golangci-lint
uses: reviewdog/action-golangci-lint@v2
with:
go_version_file: go.mod
version: v1.51.1
github_token: ${{ secrets.github_token }}
golangci_lint_flags: "--timeout=10m"
reporter: "github-pr-check"
reporter: github-pr-check
fail_on_error: true
filter_mode: nofilter
18 changes: 12 additions & 6 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Setup Go 1.19.4
- name: Setup Go 1.20
uses: actions/setup-go@v1
with:
go-version: 1.19.4
go-version: 1.20

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache Go build and dependencies
uses: actions/cache@v3
Expand All @@ -32,6 +32,9 @@ jobs:
${{ runner.os }}-go-${{ hashFiles('go.sum') }}
${{ runner.os }}-go-
- name: Print Go version
run: go version

- name: Run Tests
run: go test ./... -tags rocksdb -count=1 -timeout 10m

Expand All @@ -41,13 +44,13 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Setup Go 1.19.4
- name: Setup Go 1.20
uses: actions/setup-go@v1
with:
go-version: 1.19.4
go-version: 1.20

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache Go build and dependencies
uses: actions/cache@v3
Expand All @@ -60,6 +63,9 @@ jobs:
restore-keys: |
${{ runner.os }}-go-${{ hashFiles('go.sum') }}
${{ runner.os }}-go-
- name: Print Go version
run: go version

- name: Run Tests with -race
run: go test ./... -tags rocksdb -count=1 -race -short -timeout 20m
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,6 @@ config.json
.env
.vscode

# dynamic docker-network snapshot
tools/docker-network/docker-network.snapshot

2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ linters-settings:
- importShadow
- evalOrder
goimports:
local-prefixes: github.com/iotaledger/goshimmer
local-prefixes: github.com/iotaledger
gomnd:
settings:
mnd:
Expand Down
Loading

0 comments on commit e06f59b

Please sign in to comment.