Your browser does not seem to support JavaScript. As a result, your viewing experience will be diminished, and you may not be able to execute some actions.

Please download a browser that supports JavaScript, or enable it if it's disabled (i.e. NoScript).

How can you do pre-merge testing in trunk based development?

E
esther last edited by
Currently, we use a simple branching strategy, with a single main branch and one layer of feature branches; no branches on branches on branches. We also have many pipelines that run against each PR to check the code before it is merged to the main branch, including but not limited to,
- code quality
- linting
- security assurance
In a trunk-based approach, how does one run these tests before code is merged, without a PR?

I have seen https://devops.stackexchange.com/q/9855/30208 but it did not fully answer my question. Thanks in advance for your patience with a n00b question
Reply Quote 0
1 Reply Last reply
A
authera last edited by

You can still use pull requests with https://trunkbaseddevelopment.com/ . Especially with larger teams, using https://trunkbaseddevelopment.com/short-lived-feature-branches/ , you would open a pull request into the trunk, which would start the build process. Depending on your environment and desire to have rapid merges, you could merge the pull request automatically, perhaps based on things like no new style violations, sufficient code coverage, tests pass, and no new static analysis violations, and defer the human review for later.
Reply Quote 0
1 Reply Last reply

2
Posts

0
Views

Suggested Topics

git on the way
Software Programming • git • • irl

2

0
Votes

2
Posts

0
Views

S

patchTemporarilyAdd workgit add . Savegit diff >> patchfile Closepatch -p1 < patchfile stashSave work temporarilyAdd workgit add . Savegit stash Messagegit stash save 'メッセージ' You can see a list of saved state.git stash list Back to previous workgit stash apply
E

Jenkins Declarative Pipeline: Can Jenkins execute a dynamic list of jobs?
Continuous Integration and Delivery (CI, CD) • automation jenkins pipeline job dsl • • emran

2

0
Votes

2
Posts

1
Views

I'm not really sure I understand your question, but you can execute arbitrary Groovy inside of a script block, so you can do just about anything within script. For example, here is my interpretation of what you are asking for: stage ('Execute jobs') { steps { node('node1') { script { parallel_jobs = [:] if (params.includeJob1 == "true") { parallel_jobs['ci'] = { build job: job1, parameters: [], propagate: true } } parallel_jobs['second'] = { build job: job2, parameters: [], propagate: true } // ... // and more jobs dinamically added to the parallel_jobs list // ... parallel_jobs['etc'] = ... if (params.parallel) { // execute jobs in parallel parallel(parallel_jobs) } else { // execute jobs in sequence parallel_jobs.each { name, closure-> closure.call() } } } } } } In Groovy, Maps (i.e. associative arrays) are ordered. So if you use this to execute the builds serially rather than in parallel, the builds will be executed in the order they are defined.
S

Git branch structure in local as the one provided by pull-request?
Software Programming • git • • shizuka

2

0
Votes

2
Posts

0
Views

J

You can get exactly the same thing the trick isn't in. create branches... the trick is like you create them and then mixtures the branches... let's say you have a branch. main and you have to make 3 features, with 2 commits each. Start feature1 from main, 2 commits, you go to main, mixtures (if not indicated --no-ff, git won't mix... it will place main at the feature point1)... if at this point you start feature 2, it will happen exactly the same as mixing... the same with feature 3, you have a straight line.Now tell us that we start the 3 branches on main at the beginning.... we checkout feature1.... we do the 2 commits, we mix.... git will make fast-forwarf again. Now we checkout feature 2 (which started where main was before). 2 commits, we make main checkout, now when making merge git can't make fast-forward and you'll have the separate feature2 branch. Maybe it would happen with feature 3.
How can I create a dev. environnement using Azure DevOps?
Continuous Integration and Delivery (CI, CD) • node.js git azure devops • • Marcee

2

0
Votes

2
Posts

0
Views

K

I advice you to learn the basis with generic technologies and then use Azure. The basic and modern devops flow Devops admin configure the webhook or trigger to connect the git server with the ci,cd,devops sever Devops admin configure the job with steps required to build the application. Developer push some source code (java, php, c#, nodejs, etc) Your git platform/server (bitbucket, gitlab, github, azure, etc) detects this event and perform an http post request to your webhook url (preconfigured) sending it a json payload with important information related to detected event. You ci,cd,devops,etc server receives the http post request and using a json parser extract some important or common values used in devops automation like : repository name, branch name, commit author, commit message, etc Your ci,cd,devops,etc server launchs a preconfigured job. At this point you could start, launch or invoke any technology. (java, php, c#, nodejs, etc) required to build the application More details here: https://jrichardsz.github.io/devops/devops-with-git-and-jenkins-using-webhooks https://jrichardsz.github.io/devops/configure-webhooks-in-github-bitbucket-gitlab Devops flow with open source git server: github, bitbucket, gitlab, etc ci,cd,devops server: jenkins, Harness CI,etc. Check https://harness.io/blog/continuous-delivery/best-jenkins-alternatives/ and https://devops.com/11-open-source-devops-tools-we-love-for-2021/ Devops flow with Azure git server: Azure Repos: https://azure.microsoft.com/en-us/services/devops/repos/ ci,cd,devops server: Azure Devops: https://azure.microsoft.com/en-us/services/devops/ Azure Pipelines: https://azure.microsoft.com/en-us/services/devops/pipelines/ Steps Devops admin configure the pipeline trigger to connect the azure repos with the azure devops/pipeline sever: https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/azure-repos-git?view=azure-devops&tabs=yaml#ci-triggers Devops admin configure the azure-pipeline with steps required to build the application: https://github.com/bdellegrazie/vue-hello-world/blob/master/azure-pipelines.yml Developer push some source code (java, php, c#, nodejs, etc) Azure repos detects this event and perform an http post request to Azure Devops sending it a json payload with important information related to detected event. Azure Devops server receives the http post request and starts the interpretation of azure-pipeline.yml Azure Devops server launches all the steps preconfigured in the azure pipeline, in your case: npm install, npm run build and npm run start Docker I advice you Docker to skip the azure-pipeline.yml creation. With docker you app will be deployable on any server (gcp,aws,digital ocena, azure, bare metal, etc) in the galaxy. With azure-pipeline.yml just on Azure. Check this: https://stackoverflow.com/questions/60604539/how-to-use-docker-in-the-development-phase-of-a-devops-life-cycle/60780840#60780840 Kubernetes If you achieve the previous steps, you could start the use of kubernetes Enterprises environments If your company has the recommended environments like: staging, testing, uat, pre-prod, etc you will need a configuration management. Check this: https://stackoverflow.com/questions/54220775/how-to-use-variable-substitution-in-frontend-js-applications-like-backend-applic/54271114#54271114
C

How to make MiniTest Ruby determine a normal operator puts
Software Programming • ruby testing testng • • courtlanda

2

0
Votes

2
Posts

0
Views

I didn't find a direct solution and I found a bypass. I'm using a built-in. gem logger https://ruby-doc.org/stdlib-2.1.0/libdoc/logger/rdoc/Logger.html Example of use @logger = Logger.new(STDERR)and then @logger.info('anything you want')
R

Git alias for the current branch name
Software Programming • git • • Rossere

2

0
Votes

2
Posts

0
Views

K

Ricardo you can use the alias as follows:[alias]# Get your branchbranch-name = "!git rev-parse --abbrev-ref HEAD"#Publish your branchpublish = "!git push -u origin $(git branch-name)"#Deletes the remote version of your branchunpublish = "!git push origin :$(git branch-name)"That way you would use it like this:$ git checkout -b feature/nova-feature // aqui eu trabalho na nova feature ate ficar ok $ git publish $ git unpublish Take a look at the alias used in this https://gist.github.com/robmiller/6018582 from the github user @robmiller, who I believe you have managed to implement a well-productive workflow.
E

Where's the best place to keep Git repositories?
Software Programming • git bitbucket • • elysha

2

0
Votes

2
Posts

0
Views

O

Um, don't throw stones, but I'll keep them in cloud.mail.ruLike an alternative to a Yandex. https://www.borodatiyadmin.ru/udalennyj-repozitorij-git-i-yandex-disk/ :#Создаем локальный репозиторий mkdir /mnt/data/Project/test_repo cd /mnt/data/Project/test_repo git init #Создаем файл hello_world.txt c произвольным содержимым touch hello_world.txt nano hello_world.txt #Помещаем только что созданный файл под контроль Git git add . #Фиксируем изменения git commit -m "First commit" #Создаем удаленный репозиторий mkdir /mnt/data/Яндекс.Диск/git_repo/test_repo.git cd /mnt/data/Яндекс.Диск/git_repo/test_repo.git #Создаем репозиторий без рабочей копии git init --bare #Возвращаемся в локальный репозиторий cd /mnt/data/Project/test_repo #В локальном репозитории указываем где искать удаленный #yandex_disk - псевдоним для полного пути к удаленному репозиторию git remote add yandex_disk /mnt/data/Яндекс.Диск/git_repo/test_repo.git #Передаем изменения из локального репозитория в удаленный #master - текущая ветка разработки git push yandex_disk master
J

How to run test with CMD in Azure Devops?
Continuous Integration and Delivery (CI, CD) • azure devops yaml • • Jolied

2

0
Votes

2
Posts

1
Views

I think the condition attribute is missing: - task: PublishTestResults@2 inputs: failTaskOnFailedTests: false testRunner: VSTest testResultsFiles: '**/*.trx' searchFolder: '$(Build.Repository.LocalPath)' condition: succeededOrFailed() From the documentation: In this YAML, PublishTestResults@2 will run even if the previous step fails because of the succeededOrFailed()
M

Pull Request
Software Programming • git github • • meriah

2

0
Votes

2
Posts

0
Views

O

(Comments are summarized)Tell the contents of the correction that you want to merge to the maintainer, and ask how to merge (PR) to the maintainer.
O

running a phpUnit test within a docker container
Continuous Integration and Delivery (CI, CD) • docker docker compose dockerfile • • obi

2

0
Votes

2
Posts

1
Views

B

Don't quote the command you're trying to run, just do: docker run --rm -it -v ~/Users/mow/Documents/devFolder/testdev:/app testdev_php php ./vendor/bin/phpunit Your image is looking for a file called "php ./vendor/bin/phpunit" instead of looking for "php" and passing everything else on the line to it. This is the real reason docker requires all your parameters before the image, because the parameter after the image is the command and everything after it is parameters to that command - don't quote everything. The Dockerfile equivalent is: ENTRYPOINT ["/init","parameter1","parameter2","parameter3"] If it still doesn't work, check the parent Dockerfiles for the location of "php" docker run --rm -it -v ~/Users/mow/Documents/devFolder/testdev:/app testdev_php /usr/local/bin/php ./vendor/bin/phpunit
R

git push
Software Programming • git windows 10 git bash • • rosemadder

2

0
Votes

2
Posts

0
Views

P

If you have any questions, let’s write about the environment. https://www.hyuki.com/writing/techask.html#env Git for WindowsPerhaps the module of theモジュールdentials manager is not working properly. Stack Overflow https://stackoverflow.com/questions/67960886/git-2-32-git-push-u-origin-master-nothing-happens In the older version of Git for Windows, check "Enable Git Credential Manager" on the "Configuring extra options" screen of the installer, so that the .NET Framework-based "Git Credential Manager" is used by default. https://github.com/microsoft/Git-Credential-Manager-Core "Recommended. https://github.com/git-for-windows/build-extra/blob/main/ReleaseNotes.md#changes-since-git-for-windows-v2290-october-19th-2020 In the new Git for Windows installer ‘Choose a。dential helper’ screen, the new Git Credential Manager Core is selected by default, but Git for Windows v2.32.0 seems to be not working correctly.(C:\Program Files\Git\mingw64\libexec\git-core\git-credential-manager-core.exe)I am not sure how to solve the problem of Manager Core, but I think that it can be avoided temporarily by using "wincred" as an alternative.(C:\Program Files\Git\mingw64\libexec\git-core\git-credential-wincred.exe)In TortoiseGit, "Settings" → "Git" → "Credential""wincred", "manager" and "manager-core".$ git config --global credential.helper wincred The認証dentials entered in the authentication dialog are managed by theマネージャーdentials manager on Windows.If you want to delete the情報dentials, you can delete it by "Control Panel" → "User Account" → "Certified Information Manager" → "Windows情報dentials".
E

Switches at App.config and Web.config
Software Programming • c sharp git continuous integration • • esther

2

0
Votes

2
Posts

0
Views

In each of the projects, the app.config has an open connection line of the production database.Sounds dangerous. So, by giving the developer access to the repository, you trust him with access to the combat database. I think that access to combat infrastructure should be as limited as possible. So it's got to be removed from the repository.I suggest moving key connection parameters (e.g. logic and password or token, or whatever else might be) from the configuration to the variable environment.The usefulness of such an approach is very detailed in the manifest. https://12factor.net/ru/config Many CI serves can store such variables and initiate their environment before launching your application. That's right. https://docs.gitlab.com/ce/ci/variables/#secret-variables ♪ https://jenkins.io/doc/pipeline/tour/environment/ and https://docs.travis-ci.com/user/environment-variables/#Defining-Variables-in-Repository-Settings (References to the records of the pitches).Access to surveillance and editing of classified variables will be available to users with maximum access. If you don't light the variables in the bow of the assembly, they won't be available in random traffic. Just don't duplicate the team to connect to the database.It will also be necessary to build secret variables to be used only when the code is decorated from your release line.The programmer will initiate the environment itself, you can write some kind of crypt to help him.
R

Can the Waterfall method leverage CI/CD+ and still be considered Waterfall?
Continuous Integration and Delivery (CI, CD) • agile waterfall • • Rossere

2

0
Votes

2
Posts

1
Views

I don't see why not. Sequential SDLC models, like waterfall, are about the organization of steps. The requirements are "finalized" before extensive design begins. The design is "finalized" before the implementation begins. System testing happens after the requirements are satisfied. Some waterfall-like models, such as the sashimi model with some overlap between these phases or waterfall-with-subprojects, are multiple waterfalls after the overall system requirements and architecture have been completed. There's nothing in the organization of these steps that would prevent continuous integration or configuration of code. Continuous deployment to a development environment is also possible, but continuous delivery or continuous deployment to production may or may not be possible, depending on the usability of interim builds before the requirements are complete. These practices can still be used once system implementation begins. CI and automated tests can help developers find issues during development before system integration and system testing activities begin. Configuration as Code can help with the configuration management of the system, allowing it to be versioned alongside the software system and rolled out to different test and production environments when it's time. The key difference between highly sequential models and iterative and incremental models is responding to feedback, not the practices that can be used. Some practices may not make as much sense to use, especially if they are about getting and responding to feedback. If you have "finalized" requirements and "finalized" designs before you can start getting feedback on the system, stakeholder feedback will likely change those requirements and/or designs. Because of the scope of the work of requirements and design and the impact on the built system, late changes are expensive.
R

How's GitHub cloned repository throwing into a new, using Androidstudio?
Software Programming • android android studio git github • • Raziyah00

2

0
Votes

2
Posts

0
Views

Open the console, move on to your project, which needs to be replaced by url, execute the team.git remote set-url origin https://github.com/USERNAME/OTHERREPOSITORY.git This team may be reviewed or notgit remote -v Android Studio will take changes in the next launch.
C

Problem with intents :MacroDroid
Mobile Testing • automation intents mac languagerodroid • • Cleofas

2

0
Votes

2
Posts

0
Views

If you want to turn on the Out Loud using automation app, do this: Target: Activity Package: com.hillman.out_loud Class: com.hillman.out_loud.activity.OnActivity Leave the rest entries untouched. If you want to turn off the Out Loud, do this: Target: Activity Package: com.hillman.out_loud Class: com.hillman.out_loud.activity.OffActivity If you want to toggle the state, do this: Target: Activity Package: com.hillman.out_loud Class: com.hillman.out_loud.activity.ToggleOnOffActivity Check your notification panel/bar to see the changes. If toggled to On state, Loud Out would create a notification (low priority), else the notification would be missing.

How can you do pre-merge testing in trunk based development?

Suggested Topics

git on the way Software Programming • git • • irl

Jenkins Declarative Pipeline: Can Jenkins execute a dynamic list of jobs? Continuous Integration and Delivery (CI, CD) • automation jenkins pipeline job dsl • • emran

Git branch structure in local as the one provided by pull-request? Software Programming • git • • shizuka

How can I create a dev. environnement using Azure DevOps? Continuous Integration and Delivery (CI, CD) • node.js git azure devops • • Marcee

How to make MiniTest Ruby determine a normal operator puts Software Programming • ruby testing testng • • courtlanda

Git alias for the current branch name Software Programming • git • • Rossere

Where's the best place to keep Git repositories? Software Programming • git bitbucket • • elysha

How to run test with CMD in Azure Devops? Continuous Integration and Delivery (CI, CD) • azure devops yaml • • Jolied

Pull Request Software Programming • git github • • meriah

running a phpUnit test within a docker container Continuous Integration and Delivery (CI, CD) • docker docker compose dockerfile • • obi

git push Software Programming • git windows 10 git bash • • rosemadder

Switches at App.config and Web.config Software Programming • c sharp git continuous integration • • esther

Can the Waterfall method leverage CI/CD+ and still be considered Waterfall? Continuous Integration and Delivery (CI, CD) • agile waterfall • • Rossere

How's GitHub cloned repository throwing into a new, using Androidstudio? Software Programming • android android studio git github • • Raziyah00

Problem with intents :MacroDroid Mobile Testing • automation intents mac languagerodroid • • Cleofas

git on the way
Software Programming • git • • irl

Jenkins Declarative Pipeline: Can Jenkins execute a dynamic list of jobs?
Continuous Integration and Delivery (CI, CD) • automation jenkins pipeline job dsl • • emran

Git branch structure in local as the one provided by pull-request?
Software Programming • git • • shizuka

How can I create a dev. environnement using Azure DevOps?
Continuous Integration and Delivery (CI, CD) • node.js git azure devops • • Marcee

How to make MiniTest Ruby determine a normal operator puts
Software Programming • ruby testing testng • • courtlanda

Git alias for the current branch name
Software Programming • git • • Rossere

Where's the best place to keep Git repositories?
Software Programming • git bitbucket • • elysha

How to run test with CMD in Azure Devops?
Continuous Integration and Delivery (CI, CD) • azure devops yaml • • Jolied

Pull Request
Software Programming • git github • • meriah

running a phpUnit test within a docker container
Continuous Integration and Delivery (CI, CD) • docker docker compose dockerfile • • obi

git push
Software Programming • git windows 10 git bash • • rosemadder

Switches at App.config and Web.config
Software Programming • c sharp git continuous integration • • esther

Can the Waterfall method leverage CI/CD+ and still be considered Waterfall?
Continuous Integration and Delivery (CI, CD) • agile waterfall • • Rossere

How's GitHub cloned repository throwing into a new, using Androidstudio?
Software Programming • android android studio git github • • Raziyah00

Problem with intents :MacroDroid
Mobile Testing • automation intents mac languagerodroid • • Cleofas