Skip to content

Commit d6cee8d

Browse files
Fix commit push GitHub workflows (#11276)
fix(ci): Migrate to commit-headless v3 fix(ci): Clean up change detection Co-authored-by: bruce.bujon <bruce.bujon@datadoghq.com>
1 parent 014f0d2 commit d6cee8d

5 files changed

Lines changed: 0 additions & 25 deletions

.github/workflows/add-release-to-cloudfoundry.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,13 @@ jobs:
4343
run: |
4444
echo "${{ steps.get-release-version.outputs.VERSION }}: ${{ steps.get-release-url.outputs.URL }}" >> index.yml
4545
- name: Commit changes
46-
id: create-commit
4746
run: |
4847
git config user.name "github-actions[bot]"
4948
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
50-
51-
if [[ -z "$(git status -s)" ]]; then
52-
echo "No changes to commit, exiting."
53-
exit 0;
54-
fi
55-
5649
git add --all
5750
git commit -m "chore: Add version ${{ steps.get-release-version.outputs.VERSION }} to Cloud Foundry"
58-
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
5951
- name: Push changes
6052
uses: DataDog/commit-headless@ad3668640012ec69186398f43d61923f6878bbbe # action/v3.2.0
61-
if: ${{ steps.create-commit.outputs.commit != '' }}
6253
with:
6354
branch: cloudfoundry
6455
command: push
65-
commits: "${{ steps.create-commit.outputs.commit }}"

.github/workflows/create-release-branch.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,10 @@ jobs:
115115
fi
116116
117117
- name: Commit changes
118-
id: create-commit
119118
run: |
120119
git config user.name "github-actions[bot]"
121120
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
122121
git commit -m "chore: Pin system-tests for release branch" .github/workflows/run-system-tests.yaml .gitlab-ci.yml
123-
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
124122
125123
- name: Push changes
126124
uses: DataDog/commit-headless@ad3668640012ec69186398f43d61923f6878bbbe # action/v3.2.0
@@ -130,7 +128,6 @@ jobs:
130128
head-sha: "${{ steps.get-latest-commit-sha.outputs.sha }}"
131129
create-branch: true
132130
command: push
133-
commits: "${{ steps.create-commit.outputs.commit }}"
134131

135132
- name: Create pull request
136133
env:

.github/workflows/update-gradle-dependencies.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@ jobs:
6969
7070
- name: Create core commit
7171
if: steps.check-core-changes.outputs.commit_changes == 'true'
72-
id: create-core-commit
7372
run: |
7473
git add --all
7574
git commit -m "chore: Update Gradle dependencies"
76-
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
7775
7876
- name: Push core changes
7977
if: steps.check-core-changes.outputs.commit_changes == 'true'
@@ -84,7 +82,6 @@ jobs:
8482
head-sha: "${{ github.sha }}"
8583
create-branch: true
8684
command: push
87-
commits: "${{ steps.create-core-commit.outputs.commit }}"
8885

8986
- name: Create core pull request
9087
if: steps.check-core-changes.outputs.commit_changes == 'true'
@@ -129,11 +126,9 @@ jobs:
129126
130127
- name: Create instrumentation commit
131128
if: steps.check-instrumentation-changes.outputs.commit_changes == 'true'
132-
id: create-instrumentation-commit
133129
run: |
134130
git add --all
135131
git commit -m "chore: Update instrumentation Gradle dependencies"
136-
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
137132
138133
- name: Push instrumentation changes
139134
if: steps.check-instrumentation-changes.outputs.commit_changes == 'true'
@@ -144,7 +139,6 @@ jobs:
144139
head-sha: "${{ github.sha }}"
145140
create-branch: true
146141
command: push
147-
commits: "${{ steps.create-instrumentation-commit.outputs.commit }}"
148142

149143
- name: Create instrumentation pull request
150144
if: steps.check-instrumentation-changes.outputs.commit_changes == 'true'

.github/workflows/update-jmxfetch-submodule.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,10 @@ jobs:
4040
run: echo "branch=ci/update-jmxfetch-submodule-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
4141
- name: Commit changes
4242
if: steps.check-changes.outputs.commit_changes == 'true'
43-
id: create-commit
4443
run: |
4544
git config user.name "github-actions[bot]"
4645
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
4746
git commit -m "feat(ci): Update agent-jmxfetch submodule" dd-java-agent/agent-jmxfetch/integrations-core
48-
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
4947
- name: Push changes
5048
uses: DataDog/commit-headless@ad3668640012ec69186398f43d61923f6878bbbe # action/v3.2.0
5149
if: steps.check-changes.outputs.commit_changes == 'true'
@@ -57,7 +55,6 @@ jobs:
5755
head-sha: "${{ github.sha }}"
5856
create-branch: true
5957
command: push
60-
commits: "${{ steps.create-commit.outputs.commit }}"
6158
- name: Create pull request
6259
if: steps.check-changes.outputs.commit_changes == 'true'
6360
env:

.github/workflows/update-smoke-test-latest-versions.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,10 @@ jobs:
121121
122122
- name: Create commit
123123
if: steps.check-changes.outputs.has_changes == 'true'
124-
id: create-commit
125124
run: |
126125
git add dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties \
127126
dd-smoke-tests/maven/src/test/resources/latest-tool-versions.properties
128127
git commit -m "chore: Update smoke test latest tool versions"
129-
echo "commit=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
130128
131129
- name: Push changes
132130
if: steps.check-changes.outputs.has_changes == 'true'
@@ -137,7 +135,6 @@ jobs:
137135
head-sha: "${{ github.sha }}"
138136
create-branch: true
139137
command: push
140-
commits: "${{ steps.create-commit.outputs.commit }}"
141138

142139
- name: Create pull request
143140
if: steps.check-changes.outputs.has_changes == 'true'

0 commit comments

Comments
 (0)