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.

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

Feautre/1323 reorganize branches plat1 #850

Merged
merged 7 commits into from
Jul 18, 2023

Conversation

sambles
Copy link
Contributor

@sambles sambles commented Jul 17, 2023

Reorganize Branches on repos supporting multiple versions

The gitflow using master and develop is replaced with stable/<version> and main-platform1

@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

@sambles sambles merged commit b4db3e5 into main-platform1 Jul 18, 2023
17 checks passed
@sambles sambles deleted the feautre/1323-reorganize-branches_plat1 branch July 18, 2023 12:02
sambles added a commit that referenced this pull request Jul 18, 2023
* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Jul 18, 2023
* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Jul 18, 2023
* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Jul 18, 2023
* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Jul 18, 2023
* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Jul 18, 2023
* Feautre/1323 reorganize branches plat1 (#850)

* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>

* retest

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Jul 18, 2023
* Feautre/1323 reorganize branches plat1 (#850)

* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>

* retest

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Jul 18, 2023
* Feautre/1323 reorganize branches plat1 (#850)

* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>

* Add mysqlclient

* Updated Package Requirements: mysqlclient==2.1.1

* rt

* Updated Package Requirements: django==3.2.20

* rt

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Jul 18, 2023
* Feautre/1323 reorganize branches plat1 (#850)

* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>

* Add mysqlclient

* Updated Package Requirements: mysqlclient==2.1.1

* rt

* Updated Package Requirements: django==3.2.20

* rt

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Jul 18, 2023
* Feautre/1323 reorganize branches plat1 (#850)

* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>

* Add mysqlclient

* Updated Package Requirements: mysqlclient==2.1.1

* rt

* Updated Package Requirements: django==3.2.20

* rt

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Sep 13, 2023
* Update CI 1.28 (#853)

* Feautre/1323 reorganize branches plat1 (#850)

* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>

* retest

---------

Co-authored-by: awsbuild <[email protected]>

* Fix to tag piwind repo on publish (#865)

* Fix to tag piwind repo on publish

Extract prev versions for latest released worker

Disable guards to test release script

Set version 2.2.1rc2

Add option to set min CVE errors

Fix

fix

Fix ktools tag and latest publish

Fix boolean

Update changelog

Update changelog

test push git tag

Update changelog

test piwind tag from remote workflow

test

Revert "test"

This reverts commit 82f8ae7.

f

finish pub script

* Revert files edited in release testing

* switch piwind tag to main branch

* Fix cryptography CVE-2023-38325 - platform 1   (#874)

* Updated Package Requirements: cryptography==41.0.2 autobahn pyopenssl

* Updated Package Requirements: certifi==2023.7.22

* retest

---------

Co-authored-by: awsbuild <[email protected]>

* revert settings compatibility to older version (#878)

* revert settings compatibility to older version

* keep both checks

* Update unittest

* Catch and report all execptions from ods-tools val (#884)

* draft actions stable image testing

* Select correct piwind branches

* Fix log storage

* fix

* Use latest piwind meta-data on older workers but skip output compare

* test stable images update

* fix

* update and retest

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Sep 13, 2023
* Update CI 1.28 (#853)

* Feautre/1323 reorganize branches plat1 (#850)

* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>

* retest

---------

Co-authored-by: awsbuild <[email protected]>

* Fix to tag piwind repo on publish (#865)

* Fix to tag piwind repo on publish

Extract prev versions for latest released worker

Disable guards to test release script

Set version 2.2.1rc2

Add option to set min CVE errors

Fix

fix

Fix ktools tag and latest publish

Fix boolean

Update changelog

Update changelog

test push git tag

Update changelog

test piwind tag from remote workflow

test

Revert "test"

This reverts commit 82f8ae7.

f

finish pub script

* Revert files edited in release testing

* switch piwind tag to main branch

* Fix cryptography CVE-2023-38325 - platform 1   (#874)

* Updated Package Requirements: cryptography==41.0.2 autobahn pyopenssl

* Updated Package Requirements: certifi==2023.7.22

* retest

---------

Co-authored-by: awsbuild <[email protected]>

* revert settings compatibility to older version (#878)

* revert settings compatibility to older version

* keep both checks

* Update unittest

* Catch and report all execptions from ods-tools val (#884)

* draft actions stable image testing

* Select correct piwind branches

* Fix log storage

* fix

* Use latest piwind meta-data on older workers but skip output compare

* test stable images update

* fix

* update and retest

---------

Co-authored-by: awsbuild <[email protected]>
sambles added a commit that referenced this pull request Sep 13, 2023
* Update CI 1.28 (#853)

* Feautre/1323 reorganize branches plat1 (#850)

* update readme title

* Update CI plat1

* Fix piwind branch select

* Updated Package Requirements: pyYaml==5.3.1

* Revert "Updated Package Requirements: pyYaml==5.3.1"

This reverts commit 094bcda.

* fix

* bump minor version for testing

---------

Co-authored-by: awsbuild <[email protected]>

* retest

---------

Co-authored-by: awsbuild <[email protected]>

* Fix to tag piwind repo on publish (#865)

* Fix to tag piwind repo on publish

Extract prev versions for latest released worker

Disable guards to test release script

Set version 2.2.1rc2

Add option to set min CVE errors

Fix

fix

Fix ktools tag and latest publish

Fix boolean

Update changelog

Update changelog

test push git tag

Update changelog

test piwind tag from remote workflow

test

Revert "test"

This reverts commit 82f8ae7.

f

finish pub script

* Revert files edited in release testing

* switch piwind tag to main branch

* Fix cryptography CVE-2023-38325 - platform 1   (#874)

* Updated Package Requirements: cryptography==41.0.2 autobahn pyopenssl

* Updated Package Requirements: certifi==2023.7.22

* retest

---------

Co-authored-by: awsbuild <[email protected]>

* revert settings compatibility to older version (#878)

* revert settings compatibility to older version

* keep both checks

* Update unittest

* Catch and report all execptions from ods-tools val (#884)

* draft actions stable image testing

* Select correct piwind branches

* Fix log storage

* fix

* Use latest piwind meta-data on older workers but skip output compare

* test stable images update

* fix

* update and retest

---------

Co-authored-by: awsbuild <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants