Skip to content

Develop -> Master PR#2410

Merged
tynes merged 15 commits intomasterfrom
develop
Apr 4, 2022
Merged

Develop -> Master PR#2410
tynes merged 15 commits intomasterfrom
develop

Conversation

@tynes
Copy link
Copy Markdown
Contributor

@tynes tynes commented Apr 4, 2022

Description
Merge develop into master

tynes and others added 15 commits March 31, 2022 16:18
Skip some tests that flake in CI.
It is safe to skip these because
this code will not be changed and we
will be deprecating this codebase soon.
…ests

l2geth: skip flaky accountcmd tests
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
… changeset (#2389)

Co-authored-by: Maurelian <maurelian@protonmail.ch>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* deps: bump to typescript@4.6.2

This bumps the typescript dep so that only one needs
to be installed and updates to the latest version
of typescript

* Update tsconfigs

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Teleportr was getting released on GitHub, but not pushed to Docker Hub. The indexer's canary builds were pushing `batch-submitter-service` images, which was incorrect.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
- Requires all threads to be resolved
- Adds/removes a `conflict` label when there are merge conflicts/when they are cleared.
- Adds a comment and removes the `on-merge-train` label when a queued merge fails.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Not sure why Mergify didn't pick this up in CI.
The tests include:
- `TestBoundedForkedSync62`
- `TestBoundedForkedSync63Full`
- `TestBoundedForkedSync63Fast`
- `TestBoundedForkedSync64Full`
- `TestBoundedForkedSync64Fast`
- `TestBoundedForkedSync64Light`

None of these tests cover code that we use in production.
These tests were flaky upstream and eventually fixed.
No major changes to this codebase are planned before
deprecating it.

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
This should speed up builds as more common
base images are built and also opens
up the possibility of using generics in the code.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* go-builder: bump versions

Use `golang:1.18.0-alpine3.15`
and `golangci-lint@1.45.2`. This
will allow linting of code that
uses generics

* ci: add go-builder + js-builder to ci publish

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* Revert "l2geth: Publish transactions to external msg queue"

This reverts commits:
* 9f05c87^..f834886
* 3e016ae^..36991e6

* add changeet

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Apr 4, 2022

🦋 Changeset detected

Latest commit: 0c4d4e0

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions github-actions bot added 2-reviewers A-pkg-core-utils Area: packages/core-utils A-cannon Area: cannon A-ops Area: ops A-pkg-sdk Area: packages/sdk labels Apr 4, 2022
@mergify mergify bot requested review from mslipper and tuxcanfly April 4, 2022 20:50
@tynes tynes merged commit 7fe3a55 into master Apr 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-cannon Area: cannon A-ops Area: ops A-pkg-core-utils Area: packages/core-utils A-pkg-sdk Area: packages/sdk

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants