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.

Filter by
Sorted by
Tagged with
0
votes
2answers
24 views

Git keeps asking for ssh passphrase when SSH is already defined in GitLab

I'm playing around with a personal GitLab account to get familiar with its' ins and outs. First, I followed this primer on setting ssh keys and added public and private ED25519 keys to ~\.ssh. I added ...
1
vote
1answer
33 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 ...
2
votes
0answers
33 views

How to push large codebase to lots of servers

I am currently creating a concept for a multi-stage release pipeline using Azure DevOps release pipelines. The software stack that should be deployed is a rather bulky PHP application that uses lots ...
0
votes
0answers
8 views

Codepipeline , bitbucket cloud, and deployments dashboard

After reviewing this post, https://aws.amazon.com/blogs/devops/aws-codepipeline-build-status-in-a-third-party-git-repository/, I was able to set up feedback from AWS codepipeline in bitbucket and have ...
0
votes
0answers
11 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
48 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 ...
0
votes
1answer
36 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 ...
2
votes
1answer
112 views

Commit messages from Submodules to Jenkins Change Log

I have a project with 3 submodules that are updated whenever that project is built and the project is built mainly for an installer (which is not in a submodule). Not a lot of changes are made in the ...
1
vote
0answers
9 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
2answers
99 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
47 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
1answer
74 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, ...
5
votes
2answers
266 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 ...
2
votes
2answers
921 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 "...
2
votes
2answers
65 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
485 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. ...
1
vote
1answer
48 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 ...
8
votes
1answer
4k views

Multi-language Monorepo

We currently have a "front-end" git repository that is all of our JavaScript client apps, and a "back-end" git repository containing all back end APIs written in .NET Core. There is also a few other ...
5
votes
3answers
3k views

Validating certificates with get_url or yum on CentOS 7 using Ansible

I'm pretty new to Ansible, but it seemed a better tool than a bash script for installing programs from source on remote servers... Starting from my working-but-fragile bash script, I made an Ansible ...
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 ...
13
votes
4answers
55k 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 ...
0
votes
1answer
334 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
40 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
0answers
89 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
224 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
25 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
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
492 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
61 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 ...
0
votes
1answer
368 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 ...
6
votes
3answers
204 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 ...
2
votes
1answer
534 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 ...
1
vote
1answer
53 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 ...
0
votes
1answer
240 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 ...
2
votes
1answer
62 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. ...
7
votes
2answers
2k views

What is the exact use of DETACHED HEAD state in Git?

When I checkout a specific commit hash, it goes to detached mode where HEAD POINTER can't point to a recent commit. What are the things we can do and what is the use of going detached head state in ...
2
votes
3answers
4k views

Is there a way to use a Jenkinsfile from a git-submodule in a multibranch pipeline?

Background: The nature of our project's source involves multiple long-living branches, each one has its own Jenkins job (manually created). Multibranch limitation: Unfortunately we do not use a ...
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
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 ...
0
votes
1answer
61 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
285 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 ...
4
votes
1answer
866 views

Heroku Slack integration without using Github

Heroku has this great Slack chatbot (chatops) that lets you send messages if a deployment pipeline succeeded or failed. Unfortunately, while setting it up and logging in to Heroku, it asks for your ...
1
vote
1answer
72 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
523 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 ...
3
votes
1answer
52 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
832 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 ...
1
vote
1answer
47 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 ...
5
votes
1answer
4k views

jenkins fatal: ambiguous argument, unknown revision or path not in the working tree

In jenkins pipeline, execute git command : git log --format=%B --no-merges origin/master..origin/${currentBranch} jenkins output error : fatal: ambiguous argument 'origin/master..origin/XOPS-...
3
votes
1answer
190 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 ...
2
votes
1answer
108 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 ...