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

sync: master to release #5343

Closed
wants to merge 14 commits into from
Closed

sync: master to release #5343

wants to merge 14 commits into from

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Dec 8, 2023

sync-branches: New code has just landed in master, so let's bring release up to speed!

…lback with a changelog parameter - Fix for issue #5278 (#5283)

* Fix for issue #5278

---------

Co-authored-by: Eric Bussieres <eric.bussieres@ssq.ca>
Co-authored-by: rberezen <ruslan.berezenskyi@gmail.com>
filipelautert and others added 2 commits December 11, 2023 09:48
@filipelautert filipelautert added the skipReleaseNotes skip the Draft Release Notes label Dec 11, 2023
filipelautert and others added 5 commits December 11, 2023 16:33
…abases (#5323)

* Updated PrimaryKeyExistsPrecondition to require table name for H2 databases

This commit updates the PrimaryKeyExistsPrecondition class in order to throw an exception when no table name is provided while using H2 database. This change has been done because the H2 database driver requires a table name to be specified for searching a primary key.
* - Applied same error message for Hsqldb, SQLite and DB2 databases.
- Added integration test for these new applied DBs.
- Update existent abstract integration test.

* Move tests to be only in AbstractIntegration suite.

---------

Co-authored-by: Daniel Mallorga <dmallorga@liquibase.com>
Co-authored-by: rberezen <ruslan.berezenskyi@gmail.com>
* PAT for liquibase org repo access

* using GITHUB_TOKEN for branch and commitsha publish

* using PUBLISH_TAR_TO_BUILD_ARTIFACT_PAGE

* using maven-settings-xml-action

* remove maven-settings-xml-action

* always use master-SNAPSHOT for liquibase.pro.version

* run Matching Branch workflow

* run Matching Branch workflow

* cancel-in-progress: false

* cancel-in-progress: false

* testing with branch name

* testing with workflow_dispatch

* testing DAT-15892

* reverting back branch name

* run a workflow only when a label is added to a PR and when either of the specified workflows completes

* Installer runs only when branch-SNAPSHOT or MatchingBranch workflow are completed

* look for dependencies in maven

* removing upload of liquibase-artifacts as they contain the same files ie .tar files.

* typo fix

* we need the entire block of Build & Sign Artifacts from build.yml to be on build artifact page

* add the mvn version build step

* rearrange new-build as per build.yml file

* typo

* variable values

* debugging to check what is in liquibase-core/target

* debugging to check what is in liquibase-core/target

* debugging to check what is in liquibase-core/target

* debugging to check what is in liquibase-core/target

* uncomment run-tests.yml

* use thisBranchName and add look for dependencies in maven block

* upload and download artifact in place of cache

* compress artifacts even more

* run upload only once

* tar -xzf temp-artifact.tar.gz

* debugz

* debugz

* debugz

* debugz

* debugz-new

* debugz-new

* debugz-thisBranchName

* get branchName and replace / and _ with -

* get branchName and replace / and _ with -

* issue with commercialJarM2Location

* issue with commercialJarM2Location

* issue with commercialJarM2Location

* debugz

* thisBranchName instead of proBranchName

* build-azure-uber-jar issues

* build-azure-uber-jar issues

* typo

* issues with Build Azure Uber jar

* merge master to branch

* run build_publish_branch  job only if the run-tests job was successful

* debug runFunctionalTests

* debug2 runFunctionalTests

* debug3 runFunctionalTests

* testing labels

* testing labels

* testing labels

* in the individual workflow itself run the Functional tests

* speed up the debugging process

* speed up the debugging process

* speed up the debugging process

* run functional tests and test harness after build-publish jobs

* typo

* use sha to get the repository-dispatch sha

* get attributes triggered by

* get attributes triggered by

* debug

* debug

* debug

* debug

* read liquibaseCommit and runDescription from `run-functional-tests.yml`

* build branch changes

* test standAlone PR

* runFunc test standAlone PR get sha

* latestMergeSha len

* debug missing example folder

* debug missing example folder

* debug missing example folder

* debug missing example folder tree

* debug missing example folder tree

* debug missing example folder tree

* debug missing example folder run-test

* debug missing example folder run-test

* debug missing example folder HACK copy directly from liquibase-standard

* debug missing example folder HACK copy directly from liquibase-standard

* debug missing example folder HACK copy directly from liquibase-standard

* debug missing example folder HACK copy directly from liquibase-standard

* debug missing example folder HACK copy directly from liquibase-standard

* debug missing example folder HACK copy directly from liquibase-standard

* debug missing example folder HACK copy directly from liquibase-standard

* debug missing example folder HACK copy directly from liquibase-standard

* debug missing example folder HACK copy directly from liquibase-standard

* debug missing example folder HACK copy directly from liquibase-standard

* debug missing example folder HACK copy directly from liquibase-standard

* testing without cp command

* testing

* testing

* testing

* renaming jobs for better readability

* for standAlone PR in OSS, name the branch anything except what is in branches-ignore under run-tests.yml

* remove commented code and run test harness

* typo

* typo

* testing

* testing

* testing

* testing

* testing

* testing

* new logic , all code in one file new-build.yml

* authorize logic for forked Pr and build branch to old way of build-branch.yml

* syntax error

* needs only setup

* syntax fix

* refactor build logic

* refactor build logic

* refactor build logic

* indentation

* testing

* testing

* testing

* testing

* testing

* testing

* testing

* testing

* testing

* testing

* testing

* testing

* testing

* on workflow call in new-build.yml

* pass ossBranchName in Run Functional Tests in the github action run page of Pro-tests

* comment code branchExistsInBoth= true as its not needed anymore

* use unmodifiedBranchName for -Dbuild.branch

* use unmodifiedBranchName for liquibase-commercial

* use unmodifiedBranchName for liquibase-commercial

* replace / with _

* testing

* debugging

* debugging

* debugging

* publish branch snapshot

* proBranchNamePrefix

* no need to publish branch-SNPASHOT twice

* name change for test harness and functional test

* create release file copied from master. checking to see what changes are required.

* removing azure uber jar workflow code

* use run-tests.yml

* create-release on push matching bracnhes

* RENAME_SNAPSHOTS with pipe

* debug

* change the artifacts named from / to _

* change the artifacts named from / to _

* change the artifacts named from / to _

* all 4.25.0 changes

* all 4.25.0 changes

* use thisBranchName

* use liquibaseBranch and thisBranchName

* trigger run with commented code to check the trigger job

* remove commented code

* remove commented code

* remove commented code

* testing Tests status

* testing Tests status

* testing Tests status

* testing Tests status

* testing Tests status

* testing Tests status

* testing Tests status

* testing Tests status on test-harness

* testing Tests status on test-harness

* testing Tests status on test-harness

* testing Tests status on test-harness

* testing Tests status on test-harness

* testing Tests status on protests

* testing Tests status on protests

* testing Tests status on protests

* testing Tests status on protests

* testing Tests status on protests

* test with entire workflow

* test with entire workflow

* test with entire workflow

* testing with test-harness commented

* testing with test-harness commented

* trigger

* test harness

* test harness

* branchName containing / issues in pro-tests

* branchName containing / issues in pro-tests

* branchName containing / issues in pro-tests

* branchName containing / issues in pro-tests

* branchName containing / issues in pro-tests

* branchName containing / issues in pro-tests

* uncomment tests

* uncomment tests

* deleting build.yml and renaming new-build.yml to build.yml

* deleting build.yml and renaming new-build.yml to build.yml

* testing with Jake

* testing

* testing with sdk maven plugin changes

* Bump actions/checkout from 2 to 4 (#5132)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alejandro Alvarez <jandroav@icloud.com>

* remove verify that the contents of the tar matches the expectation

* remove verify that the contents of the tar matches the expectation

* ls liquibase-dist/target/liquibase-${{ needs.setup.outputs.thisBranchName }}-SNAPSHOT

* copy examples ahead of time

* build branch without workflow helper

* use run-test.yml in installer-build-check

* cp examples folder in artifacts

* cp examples folder in artifacts

* commment the cp command

* cp command

* cp command testing

* pro-tests issues with master and 0-SNAPSHOT

* removing liquibase-standard dir

* Revert "removing liquibase-standard dir"

This reverts commit c75d518.

* Clean

* Remove not used files.

* Delete liquibase-standard/src/test/java/liquibase/verify/saved_state/compareGeneratedSqlWithExpectedSqlForMinimalChangesets/alterSequence/mariadb.sql

Signed-off-by: filipe <flautert@liquibase.org>

* Delete liquibase-standard/src/test/java/liquibase/verify/saved_state/compareGeneratedSqlWithExpectedSqlForMinimalChangesets/createSequence/mariadb.sql

Signed-off-by: filipe <flautert@liquibase.org>

* Delete liquibase-standard/src/test/java/liquibase/verify/saved_state/compareGeneratedSqlWithExpectedSqlForMinimalChangesets/dropSequence/mariadb.sql

Signed-off-by: filipe <flautert@liquibase.org>

* Delete liquibase-standard/src/test/java/liquibase/verify/saved_state/compareGeneratedSqlWithExpectedSqlForMinimalChangesets/renameSequence/mariadb.sql

Signed-off-by: filipe <flautert@liquibase.org>

* comment sync of master and release for now

* comment sync of master and release for now

* comment sync of master and release for now

* clean code

* upload artifacts-named as this is where test-harness is downloading it from

---------

Signed-off-by: Sayali Mohadikar <76010603+sayaliM0412@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: filipe <flautert@liquibase.org>
Co-authored-by: Sayali M <sayali@Sayalis-MacBook-Pro>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alejandro Alvarez <jandroav@icloud.com>
Co-authored-by: filipe <flautert@liquibase.org>
Signed-off-by: Sayali Mohadikar <76010603+sayaliM0412@users.noreply.github.com>
Signed-off-by: Sayali Mohadikar <76010603+sayaliM0412@users.noreply.github.com>
Co-authored-by: Sayali M <sayali@Sayalis-MacBook-Pro>
Signed-off-by: Sayali Mohadikar <76010603+sayaliM0412@users.noreply.github.com>
sayaliM0412 and others added 5 commits December 12, 2023 12:20
Signed-off-by: Sayali Mohadikar <76010603+sayaliM0412@users.noreply.github.com>
* Revert "load services using ServiceLocator if allInstances is empty (#5143)"

This reverts commit fa9c488.

* Only reload allInstances from service locator if it's null or if we are running under OSGI

* Adding exceptionDetails object to structured logging

DAT-16064

* Remove change in AbstractPluginFactory that should not be there

DAT-16064

* Also show exceptionDetails on console

DAT-16064

* Also send output to console, not just log

DAT-16064

* Added another field to ExceptionDetails for exception

DAT-16064

* Handle exception when trying to get database name

DAT-16064

---------

Co-authored-by: filipe <flautert@liquibase.com>
Co-authored-by: rberezen <ruslan.berezenskyi@gmail.com>
remove sync jobs as they are failing the actual runs in OSS

Co-authored-by: Sayali M <sayali@Sayalis-MacBook-Pro>
…5362)

Signed-off-by: Sayali Mohadikar <76010603+sayaliM0412@users.noreply.github.com>
* integration tests fix

* using cache for integration tests fix

---------

Co-authored-by: Sayali M <sayali@Sayalis-MacBook-Pro>
@sayaliM0412
Copy link
Contributor

the sync between master and release branch will be done manually

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skipReleaseNotes skip the Draft Release Notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants