Questions tagged [git]
Use this tag for questions about Git, a free and open source distributed version control system, related to using Git for topics such as continuous delivery, monitoring, building SDLC infrastructure, etc.
157
questions
1
vote
0answers
20 views
Automated git pull and push commands to trigger new builds lead to git throttling every time
I'm currently using google cloud build to trigger new builds and deployments based on specific branch names in github. Pretty standard setup. I'm using Makefiles to automate deployments for 3 projects ...
0
votes
0answers
10 views
Restricting one module for one tf file
So I have file called main.tf in which I am calling the existing module for iam_role, but in same main.tf I have called one more module for service_role but I want to restrict that service_role module ...
1
vote
2answers
44 views
How to track deployments of multiple interconnected repositories
We are working with a ERP system (called Odoo, but that does not matter so much).
It consists of many building blocks. Some of this modules/addons are dependent on others, some are standalone, but ...
1
vote
0answers
8 views
git-p4 rebase command fails when using "main" as the default git branch
I'm using the git-p4 script (doc reference, code reference) to drive some processes to synchronize code stored in Perforce Helix in to GitLab. It works fine for my needs, though now that GitLab ...
0
votes
1answer
31 views
Gitlab build from multiple repositories - git submodules
I have gitlab repo ZERO (project) which serves as a code base for multiple websites (repo ONE, TWO, THREE..), these are also gitlab repositories. I am using gitlab CI/CD options, I want to be able to ...
0
votes
1answer
45 views
Using a conditional environment{ } directive in Jenkinsfiles
My Jenkinsfiles use the environment{} directive. I've been trying to set a condition where I invoke different variables depending on the GIT branch being builded.
I've tried something like e. g. :
...
2
votes
2answers
61 views
One or multiple git repositories for independent small parts of one larger project?
We are developing an Azure-based analytics platform that consists of several modules. Among other things, Azure functions, scripts for creating the infrastructure and scripts for initialising the ...
0
votes
1answer
304 views
Jenkins: Dynamically git clone only the files required for a particular job from a monorepo
We have a huge ~20GB monorepo. For a particular Jenkins job, we do not need to clone the entire repo but only need a few sub-directories.
The solution for this is of course git sparse checkout. ...
0
votes
1answer
38 views
When do I run applications on a server in a pod and when to run them directly on the base operating system?
I am trying to get started in the DevOps Field by setting up a small server currently with Virtualbox, later on for a small team. For my basic setup I plan to use gitea as self-hosted git and Jenkins ...
0
votes
1answer
286 views
Jenkins Docker - Make changes to gitconfig
I have a self-hosted Gitea organization, and the way to access the repos requires some "secret" extraheader in .gitconfig. (2FA is also enabled)
When I look at Jenkins "Configure System&...
2
votes
1answer
39 views
Is there a better model for my CI/CD cycle?
I am having some troubles finding a better model for my CI/CD cycle.
This is mainly gitflow issue.
My current model : We have 2 bitbucket branches : master and develop.
Both are linked via webhooks to ...
1
vote
1answer
195 views
Azure Devops - workflow/strategy for uploading only changed files to shared hosting provider after a build of static website (Jekyll)
Scenario:
I'm using the Ruby/Jekyll build process to generate a static website from markdown etc files via a templating process -- the same flow as the one used by Github Pages but instead of hosting ...
1
vote
0answers
22 views
How to test pipeline changes in Azure?
I currently have a pipeline in Azure which consists of a bunch of YAML which eventually calls some terraform script to handle the deployment side.
What is the best way to handle dev testing of changes ...
1
vote
0answers
84 views
Monorepo manifests image tag replacement in Github Actions
I have a mono repo with NodeJS app (or better said, components of an app).
There are 3 apps in the repo, each has its own directory and Dockerfile:
/core
/worker
/frontend
There’s also /deployments ...
1
vote
1answer
1k views
Can you remove a commit made to a branch on AWS code commit?
I know of git rebase but don't know if it can be used with AWS code commit?
Or if there's any other method of removing a commit to revert back to before it was made and merged?
0
votes
1answer
391 views
How to skip reviewer for project administrator pull request?
Is it possible to configure the repository to skip "At least one reviewer must approve the most recent iteration" in case the person who performs the Pull request is the project ...
1
vote
2answers
60 views
Command "git [command] --help" opens as HTML in my code editor - no output to terminal. How do I revert to default behavior?
When I type git reset --help I don't get output in the bash terminal, but a new tab opens in my code editor to reveal some dense HTML. How can I change Git's behavior to display the help message in ...
1
vote
1answer
28 views
Azure DevOps issue with GIT, Visual Studio and Azure (Umbraco)
I am completely new to Visual Studio, .net and Azure DevOps
I have a problem with GIT using the GIT bits (rather than CMD), in Visual Studio
I have a .Net application (Umbraco), that has been built ...
0
votes
1answer
203 views
How to get branch hash using git command
I have JenkinsFile where I'm trying to get the hash for my current branch. I saw this post: https://stackoverflow.com/questions/9110478/how-to-find-the-hash-of-branch-in-git
but when I tried to run ...
0
votes
1answer
331 views
Best practices to maintain forks of Git repository in an on-prem Azure DevOps Server
We have an on-premises Azure DevOps Server and like to use the Git workflow "Fork-Clone-Push-PR".
In the moment of forking the system let allow us decide into which project and under which ...
2
votes
1answer
57 views
Pass information between Jenkins Job builds
Please excuse my non-fluent terminology..
There is a Jenkins server, master and a few slaves, there is a pipeline job.. let's call it playground
I run the job once, I want to save some data somewhere.
...
1
vote
1answer
51 views
Git feature branching strategy allows unapproved 'tag along' features
Context
Our current operations consists of three servers: QA is a playground for devs to try out new features; Platform is the live customer facing application; Mock is a copy of Platform and ...
1
vote
1answer
48 views
Is there any other approach for tagging git branch using pipeline without credentials in pipeline code?
I was trying to tag a git branch using Gitlab CI. With the help of this answer from this community,
How to tag source code using gitlabCI
I can successfully tag a git branch from Gitlab CI pipeline. ...
0
votes
2answers
87 views
Jenkins: Re-use repository with reference option and do changes on it
I would like to setup a Jenkins cluster where the slaves are building an Android ROM with some parameters like branch (e.g. lineage-16.0) and some optional patches. The whole repository will consume ...
0
votes
1answer
60 views
git reflog is showing plain text password used
We are using Jenkins Freestyle Project to push the changes on the remote server. We are executing shell script on remote host using ssh for it. To pull the changes on remote host, we are using origin ...
3
votes
1answer
249 views
Dedicated/Separate Git Repo as Terraform Remote Backend
I see that there are multiple options for Backends, however git isn’t one of them.
I believe git can be used as a backend for tfstate, in the below steps:
Create a dedicated git repo
Commit the ...
0
votes
1answer
1k views
Jenkins Not pulling the latest commit into master or slave
I have a Jenkins pipeline where after every build I change a file(increase build version in a property file) and checkin back to the git repository. After a build, I commit some differnt code change ...
1
vote
1answer
45 views
Azure deploy pipeline with/without approval on separated enviroments
I have two separate environments under my repository:
development (Approvals are not configured but the environment exists)
production (Approvals rules are configured via dev.azure.com UI)
The ...
1
vote
1answer
70 views
What's in THIS environment?
We work on multiple java web projects going on at the same time and those are all being tested on several different QA environments. I'd like to show on our support portal what projects are in what ...
2
votes
1answer
400 views
Is it possible to view all changes made on a Git feature branch in Azure Devops?
Azure DevOps offers the overview of changes made in a branch when a PR is created. However, sometimes I'd like to have access to that overview when viewing a branch without the need to create a PR (or ...
4
votes
2answers
231 views
What is the way to update images in a configuration git repository when doing gitops?
i'm trying to do gitops
I have a Configuration repo containing k8 manifests and different app repos.
1) App repo's CI build docker images and pushes into registry.
2) App repo's CI commits into ...
1
vote
1answer
46 views
Continuous deployment
I have a nodejs application using expressjs. This server is handing a website built on vuejs, an application using angular and another angular app. Everything is working and I deployed to AWS eb using ...
2
votes
1answer
104 views
Branching model for nightly deploys
I'm a lead developer for a small B2B SaaS company, using Django and AWS. We currently run biweekly deploys after hours with a mostly-automated custom Fabric-powered tool.
We're currently exploring ...
3
votes
1answer
791 views
Using Azure Devops with Git Workflow
I have used Azure Pipeline for CI/CD on various small projects that I have worked and it has been a great experience. I am working now on a decent size project that has a web app, mobile(xamarin) app ...
6
votes
3answers
187 views
How long is it appropriate to keep old feature branches in git?
I am on a large team with many developers. We have a large codebase that has many feature branches from our large group of developers. We are accumulating many feature branches.
We generally look to ...
3
votes
1answer
346 views
What approach should I take to store environment variables for a repo?
I am setting up a new infrastructure as code repository for a small to medium size project. The problem I am currently trying to solve is how to store my environment variables such that they can be ...
3
votes
1answer
40 views
How to push to other origins using Azure Pipelines?
Inspired by Necessity of mirroring git repos for small team considering switching to Azure:
How does one use Azure Pipelines to push changes to a secondary/backup origin on push?
Possible use cases:
...
3
votes
1answer
179 views
Necessity of mirroring git repos for small team considering switching to Azure
Question:
Are there any benefits to mirroring our git repos outside of Azure devops for a small (~7) team of developers who all work in the same office?
Background Information
I'm a developer ...
5
votes
1answer
108 views
How to keep many servers (5000+) up-to-date?
Initially asked here: https://stackoverflow.com/questions/60674502/how-to-keep-many-servers-5000-up-to-date-with-git-and-its-rate-limits
The initial post:
We're making a php service that will run on ...
2
votes
2answers
854 views
Jenkins trigger build if shared library changes
I have Jenkins Pipeline job define in my git repo as.
// File: deployment/jenkinsfiles/staging/Merge
@Library("my_shared_lib") _
import com.company.myteam.Constants
pipeline {
agent { label "...
0
votes
1answer
150 views
exponential backoff for git pushes?
We've got a ton of jobs in our Jenkins that all do git pushes, sometimes simultaneously. Unsurprisingly, if two jobs try to push at the same exact time, one will succeed while the other fails. My knee-...
0
votes
2answers
3k views
Why can't I connect to Gitea using ssh via command line?
My computer: Windows 10 Pro 1909
I have a Gitea server running in my office, at local IP address 10.100.10.24, with SSH configured on port 22000. Gitea is configured to use port 3000 for HTTP.
I'm ...
1
vote
1answer
848 views
Jenkins-Deployment failure, Build successful
I have been trying to work on Jenkins and I'm able to Build the code but unable to deploy on to the Tomcat server. Have checked the users.xml file and
Started by user nakul
Running as SYSTEM
...
3
votes
1answer
198 views
When to "npm publish" when using git flow
I'm using the following resources as a guide to git flow:
git-flow cheatsheet
git-flow
Using git-flow to automate your git branching workflow
However, none of them explicitly mention at what point ...
13
votes
4answers
50k views
How to resolve merge conflicts in Azure DevOps current UI
I have followed the instructions on command line:
https://docs.microsoft.com/en-us/azure/devops/repos/git/merging?view=azure-devops&tabs=visual-studio
all I want to do is resolve this merge ...
1
vote
1answer
1k views
Jenkins Deployment Issue - Unrecognized SSL Message, Plaintext Connection?
I've been attempting to build and deploy a local copy of a repository, whilst still providing the remote depository to Jenkins, to a Tomcat version 9 server.
I have both Jenkins and Tomcat running on ...
2
votes
1answer
58 views
Bitbucket: Is there any option to restrict deletion of release branch only after it is merged to master
We are using GitFlow workflow. After merging the release/* branch to master, we need to close the branch. For this task, we need to provide deletion access to pull request merger but in this case, ...
2
votes
1answer
519 views
Does GitHub support VFS for Git?
NOTES:
I really hope that this question hasn't been asked before and as far as I know, only Azure DevOps Service (Azure DevOps on cloud) and Azure DevOps Server 2019 (Azure DevOps on-premise) fully ...
0
votes
2answers
7k views
Jenkins Pipeline - Clean before checkout - git clean -fdx "failed to remove: Directory not empty"
I have my Jenkins build configured to "Clean before Checkout" for its git source:
Job Config > Source > git > Behaviours > Clean before checkout
This results in
Resetting working tree
...
4
votes
1answer
73 views
Deploying and testing features on a server by more than one developer
I have 4 environments (prod/preprod/SIT/DEV), also two main branches (Master & Develop), two developers work on features (One & Two).
Developer One creates a feature (Feature A), he then ...
