Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: releases :merge releases into master #11448

Merged
merged 135 commits into from
Nov 22, 2023
Merged

chore: releases :merge releases into master #11448

merged 135 commits into from
Nov 22, 2023

Conversation

aarshkshah1992
Copy link
Contributor

Related Issues

Proposed Changes

This PR aims to merge the releases branch into master with the conflicts resolved.

Additional Info

Checklist

Before you mark the PR ready for review, please make sure that:

  • Commits have a clear commit message.
  • PR title is in the form of of <PR type>: <area>: <change being made>
    • example: fix: mempool: Introduce a cache for valid signatures
    • PR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, test
    • area, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps
  • If the PR affects users (e.g., new feature, bug fix, system requirements change), update the CHANGELOG.md and add details to the UNRELEASED section.
  • New features have usage guidelines and / or documentation updates in
  • Tests exist for new functionality or change in behavior
  • CI is green

snadrus and others added 30 commits September 5, 2023 12:28
@snadrus
1.23.4 rc1
c852f1d
@snadrus
fixes
3309222
@snadrus
Merge pull request #11248 from filecoin-project/changelog-1234rc1
c7b3d84 
chore: release: 1.23.4rc1 prep
@arajasek @Stebalien
chore: backport #11262 (#11265)
b9c29d6 
* fix: networking: avoid dialing when trying to handshake peers

Also, avoid handshaking with peers that don't support the handshake
protocol.

* drop unused imports

---------

Co-authored-by: Steven Allen <steven@stebalien.com>
@rjan90
Connect to newAddress
65638ae 
Connect to newAddress
@rjan90
Handle both IPv4 and IPv6
8c30e06 
use net.JoinHostPort(minerIP, minerPort) to handle both IPv4 and IPv6 addresses.
@rjan90
Merge pull request #11295 from filecoin-project/phi-worker-connect-ba…
6c8a0ea 
…ckport

chore: backport #11294 into `release/v1.23.4`
@arajasek
chore: build: bump version to 1.24.0-rc1
d498036
@arajasek
feat: docs: add 1.24.0-rc1 changelog
fd65ad5
@arajasek
Merge pull request #11332 from filecoin-project/asr/release-prep
630e58f 
chore: build: bump version to 1.24.0-rc1
@rjan90
chore: butterfly assets
35d247a 
chore: butterfly assets
@arajasek
Merge pull request #11333 from filecoin-project/chore/butterfly-assets
4d760e6 
chore: build: Butterfly assets
@snadrus
Update for v1.25
02a65a6
@arajasek
chore: deps: update to go-state-types v0.12.5
2c0468a
@rjan90
Add updated rc1-changelog to in-code changelog
72dc3d9 
Add updated changelog to in-code changelog
@rjan90
Bump version and Changelog
e1b4341 
Bump version and Changelog
@rjan90
Add #11339 to the changelog
6ecea9e 
Add #11339 to the changelog
@arajasek
Merge pull request #11339 from filecoin-project/asr/bump-gst
c7bcb2b 
chore: deps: update to go-state-types v0.12.5
@rjan90
Add updated rc1-changelog to in-code changelog
2dae731 
Add updated changelog to in-code changelog
@rjan90
Bump version and Changelog
064ffeb 
Bump version and Changelog
@rjan90
Add #11339 to the changelog
0ae4f7d 
Add #11339 to the changelog
@rjan90
Merge branch 'phi/update-changelog' of https://github.com/filecoin-pr…
4090605 
…oject/lotus into phi/update-changelog
@rjan90
Merge pull request #11340 from filecoin-project/phi/update-changelog
60f78c7 
build: release: v1.24.0-rc2
@snadrus
Merge branch 'release/v1.24.0' into release/v1.25.0
2bc4951
@snadrus
build fixed
ea71d05
@snadrus
changelog
85fd3f2
@snadrus
tidy
62ea560
@snadrus
changelog 1.25
6c4af9b
@snadrus
Merge pull request #11342 from filecoin-project/v1.25-nogen
58ff87f 
V1.25 nogen
@rjan90
build: release: v1.25.0-rc1
b722ea4 
Update the changelog for v1.25.0-rc1
jennijuju and others added 20 commits November 22, 2023 15:20
@jennijuju
Update mainnet.pi
d16456d
@Stebalien @rjan90
chore: actors: update v12 to the final release
bef644c 
This doesn't change any of the CIDs as the code is the same.
@jennijuju @rjan90
deps: gostatetype (#11437)
a3a2dba 
* bring in the final v12 tag

* mod tidy
@jennijuju
update changelog
a14183e
@rjan90
Merge pull request #11175 from protofire/feat/add-glif-bootstrap-nodes
7d8b9ed 
add glif bootstrap node on calibration
@jennijuju
update changelog
8517e71
@jennijuju @rjan90
Apply suggestions from code review
814c16b 
Co-authored-by: Phi-rjan <orjan.roren@gmail.com>
@cloudxin @rjan90
Update mainnet.pi
55117a7 
add venus node boostrap
@jennijuju
Merge pull request #11435 from filecoin-project/jen/nv21final
8a42905 
release: v1.24.0
@rjan90
Update changelog
c61a740 
Update changelog
@jennijuju
update go version in dockerfile
ce35422
@rjan90 @jennijuju
Update CHANGELOG.md
f883183 
Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
@rjan90
Merge pull request #11436 from filecoin-project/phi-v1250-final
81ce7a4 
release: v1.25.0
@jennijuju
Merge pull request #11444 from filecoin-project/jen/v124cuy
7c09348 
release: v1.24.0
@jennijuju
Merge branch 'release/v1.25.0' into jen/v125cut
4a165b3
@jennijuju
fix merge mistake and docs gen
bd59bba
@jennijuju
go tidy
f74cf00
@jennijuju
make jen
82625e3
@jennijuju
Merge pull request #11445 from filecoin-project/jen/v125cut
7e6b20c 
release: v1.25.0
@aarshkshah1992
Merge remote-tracking branch 'origin/releases'
c620ff8
@aarshkshah1992 aarshkshah1992 requested a review from a team as a code owner November 22, 2023 14:34
@aarshkshah1992 aarshkshah1992 merged commit 867f9bb into master Nov 22, 2023
82 of 87 checks passed
@aarshkshah1992 aarshkshah1992 deleted the feat/merge-releases-into-master branch November 22, 2023 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jennijuju jennijuju jennijuju approved these changes

@rjan90 rjan90 Awaiting requested review from rjan90

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@aarshkshah1992 @jennijuju @snadrus @arajasek @rjan90 @snissn @Stebalien @magik6k @lazavikmaria @cloudxin