Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master: (45 commits)
  Task: Get config cmd (iotexproject#3552)
  [ioctl] fix  Errors unhandled (iotexproject#3567)
  fix dir permission and file inclusion (iotexproject#3566)
  [test] Disable workingset cache in the benchmark test (iotexproject#3558)
  [pkg] fix  deferring unsafe method "Close" on type "*os.File" (iotexproject#3548)
  [action] Refactor handleTransfer() (iotexproject#3557)
  Add MinVersion in tls.Config (iotexproject#3562)
  [ioctl] Modify file permission as 0600 (iotexproject#3563)
  [httputil] add ReadHeaderTimeout (iotexproject#3550)
  [staking] unexport namespace (iotexproject#3551)
  move chanid metrics to chainservice (iotexproject#3544)
  [ioctl] fix log entries created from user input (iotexproject#3546)
  add log in rolldposctx (iotexproject#3553)
  fix uncontrolled data used in path expression (iotexproject#3547)
  [api] impl. TestGrpcServer_GetServerMeta (iotexproject#3559)
  [ioctl] Build action command line into new ioctl (iotexproject#3472)
  fix potential file inclusion via variable (iotexproject#3549)
  [ioctl] Incorrect conversion between integer types (iotexproject#3522)
  [action] fix incorrect conversion between integer types (iotexproject#3545)
  [test] fix TestLoadBlockchainfromDB (iotexproject#3521)
  ...
  • Loading branch information
pocockn committed Jul 21, 2022
2 parents 3a229d9 + 23c6de5 commit 2309ef9
Show file tree
Hide file tree
Showing 205 changed files with 3,120 additions and 1,817 deletions.
26 changes: 0 additions & 26 deletions .circleci/circleci_github_release.sh

This file was deleted.

207 changes: 0 additions & 207 deletions .circleci/config.yml

This file was deleted.

1 change: 0 additions & 1 deletion .circleci/coverage.txt

This file was deleted.

30 changes: 30 additions & 0 deletions .github/workflows/analysis.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: "Code Scanning - CodeQL"

on:
schedule:
- cron: "30 0 * * *"
workflow_dispatch:

jobs:
CodeQL-Build:
runs-on: ubuntu-latest
permissions:
security-events: write

actions: read
contents: read

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

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: go

- run: |
make build
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
62 changes: 36 additions & 26 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: ci

on:

pull_request:
branches: [ master ]
branches: [master]
workflow_dispatch:

permissions:
contents: read
Expand All @@ -18,27 +18,37 @@ jobs:
name: ci flow
runs-on: self-hosted
steps:

- uses: actions/checkout@v2

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17

- name: errcheck
uses: reviewdog/action-golangci-lint@v2
with:
golangci_lint_flags: "--disable-all -E errcheck"
tool_name: errcheck
level: info

- name: run-test
id: unittest
run: |
bash <(curl -s https://codecov.io/bash)
- name: make-minicluster
id: minicluster
run: |
make minicluster
- uses: actions/checkout@v3
# with:
# submodules: recursive

- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.17.2
# cache: true

# - name: Error Check
# uses: reviewdog/action-golangci-lint@v2
# with:
# golangci_lint_flags: "--disable-all -E errcheck"
# tool_name: errcheck
# level: info

- name: Run Test
id: unittest
shell: bash
run: |
go get -u golang.org/x/lint/golint
golint -set_exit_status $(go list ./... | grep -v /vendor/ | grep -v /explorer/idl/ | grep -v /api/idl/)
#go get -u github.com/dave/courtney@038390a12707e2d91979d2ca77a71597f4afe400
./go.test.sh
#make test
go test -run=XXX -bench=. $(go list ./crypto)
bash <(curl -s https://codecov.io/bash)
- name: Make Minicluster
id: minicluster
shell: bash
run: |
make minicluster
Loading

0 comments on commit 2309ef9

Please sign in to comment.