Skip to content

Merge master into stable cadence#1219

Merged
SupunS merged 71 commits into
onflow:feature/stable-cadencefrom
bjartek:merge-master-info-stable-cadence
Sep 26, 2023
Merged

Merge master into stable cadence#1219
SupunS merged 71 commits into
onflow:feature/stable-cadencefrom
bjartek:merge-master-info-stable-cadence

Conversation

@bjartek

@bjartek bjartek commented Sep 26, 2023

Copy link
Copy Markdown
Collaborator

tried to merge inn master to see if that fixes #1208

chasefleming and others added 30 commits August 21, 2023 15:40
Use custom flag if no state is available
Bumps [wangyoucao577/go-release-action](https://github.com/wangyoucao577/go-release-action) from 1.38 to 1.40.
- [Release notes](https://github.com/wangyoucao577/go-release-action/releases)
- [Commits](wangyoucao577/go-release-action@v1.38...v1.40)

---
updated-dependencies:
- dependency-name: wangyoucao577/go-release-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…wangyoucao577/go-release-action-1.40

Bump wangyoucao577/go-release-action from 1.38 to 1.40
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@v3.6.0...v3.7.0)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…golangci/golangci-lint-action-3.7.0

Bump golangci/golangci-lint-action from 3.6.0 to 3.7.0
…path argument, this pr revets that change
…-regression

Fixes regression executing transactions
chasefleming and others added 14 commits September 20, 2023 14:07
Bumps [wangyoucao577/go-release-action](https://github.com/wangyoucao577/go-release-action) from 1.38 to 1.40.
- [Release notes](https://github.com/wangyoucao577/go-release-action/releases)
- [Commits](wangyoucao577/go-release-action@v1.38...v1.40)

---
updated-dependencies:
- dependency-name: wangyoucao577/go-release-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@v3.6.0...v3.7.0)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…path argument, this pr revets that change
@bjartek

bjartek commented Sep 26, 2023

Copy link
Copy Markdown
Collaborator Author

This also appears to fix some other issues with windows compatibility

@bjartek bjartek changed the title Merge master info stable cadence Merge master into stable cadence Sep 26, 2023
@codecov-commenter

Copy link
Copy Markdown

Codecov Report

Attention: 6 lines in your changes are missing coverage. Please review.

Comparison is base (4e0bfef) 38.43% compared to head (7f57952) 38.65%.

Additional details and impacted files
@@                    Coverage Diff                     @@
##           feature/stable-cadence    #1219      +/-   ##
==========================================================
+ Coverage                   38.43%   38.65%   +0.22%     
==========================================================
  Files                          38       38              
  Lines                        1941     1948       +7     
==========================================================
+ Hits                          746      753       +7     
  Misses                       1107     1107              
  Partials                       88       88              
Flag Coverage Δ
unittests 38.65% <66.66%> (+0.22%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
internal/transactions/build.go 78.57% <100.00%> (-0.38%) ⬇️
internal/transactions/get.go 81.81% <ø> (ø)
internal/transactions/send.go 86.66% <100.00%> (ø)
internal/transactions/transactions.go 62.74% <100.00%> (+3.17%) ⬆️
internal/super/setup.go 0.00% <0.00%> (ø)
internal/test/test.go 38.93% <33.33%> (ø)
internal/super/files.go 12.35% <25.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@SupunS SupunS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@bjartek

bjartek commented Sep 26, 2023

Copy link
Copy Markdown
Collaborator Author

No problem :)

@SupunS SupunS merged commit 3d7217d into onflow:feature/stable-cadence Sep 26, 2023
@turbolent

Copy link
Copy Markdown
Member

Thank you @bjartek!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.