Updating to stay as close as possible to release/v3.3

jcsbanks
Posts: 305
Joined: Tue Mar 28, 2017 8:03 pm

Updating to stay as close as possible to release/v3.3

Postby jcsbanks » Mon Jun 17, 2019 8:42 am

I want to use as close as possible to release/v3.3 in anticipation of its release and the release of our product based upon it. This is git log after git pull and git submodule --init --recursive. I'm asking because I'm confused about the release/v3.3 tag I'm on vs the documentation. I think I must have previously done git checkout release/v3.3 because it was listed as available. Can I keep doing git pull and release/v3.3 will keep me on track? It has already taken me from 3.3 beta 2 to 3.3 beta 3.
$ git log
commit 8c57aa0242ad6e4b209129ef9cd2420224308257 (HEAD -> release/v3.3, origin/release/v3.3)
Merge: 0d5609ba9 2f7264532
Author: Angus Gratton <angus@espressif.com>
Date: Mon May 20 13:58:25 2019 +0800

Merge branch 'feature/allow_multiple_fragment_definitions_for_library' into 'release/v3.3'

Combine definitions of multiple mapping fragments referring to the same library

See merge request idf/esp-idf!4243
$ git describe --tags
v3.3-beta3-34-g8c57aa024

ESP_Sprite
Posts: 9766
Joined: Thu Nov 26, 2015 4:08 am

Re: Updating to stay as close as possible to release/v3.3

Postby ESP_Sprite » Tue Jun 18, 2019 3:46 am

Yes. The branch you are on will take you from beta to rc to final; it will also give you minor updates (v3.3.1, v3.3.2 etc) after release.

ESP_Angus
Posts: 2344
Joined: Sun May 08, 2016 4:11 am

Re: Updating to stay as close as possible to release/v3.3

Postby ESP_Angus » Tue Jun 18, 2019 3:50 am

Hi jcsbanks,

In additional to what Sprite says, note that after the v3.3 final release we will continue to backport bug fixes to this branch and then later tag v3.3.1, v3.3.2, etc after we finish QA testing based on a particular commit from the branch.

So you may want to keep an eye out for the v3.3 final release and then stop pulling updates on the release branch, in order to keep using a stable release rather than a moving target of additional fixes.

Some additional discussion can be found here:
https://docs.espressif.com/projects/esp ... start-with

(Specifically the choices are "using a stable version" vs "using a release branch", with pros and cons for both.)

Who is online

Users browsing this forum: No registered users and 126 guests