Skip to content

Commit a7f5715

Browse files
committed
Merge branch '8.0' of github.com:DOI-USGS/ISIS3 into 8.0
2 parents d1849e1 + 580bcad commit a7f5715

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

.github/workflows/gitlab-codebuild.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
name: Github to Gitlab CI - Run CodeBuild
22

33
env:
4-
PR_NUMBER: ${{ github.event.number }}
54
GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
65

76
on:
87
pull_request_target:
98
branches:
109
- '**'
10+
push:
11+
branches:
12+
- '**'
1113

1214
jobs:
1315
build:
@@ -16,15 +18,18 @@ jobs:
1618
steps:
1719
- uses: actions/checkout@v4
1820
- name: Run script
21+
env:
22+
REF_NAME: ${{ github.ref_name }}
23+
EVENT_TYPE: ${{ github.event_name }}
1924
run: |
2025
git config --global user.name "Github_CI"
2126
git config --global user.email "project_14468_bot_3f7d8e1a392afd88ead5f3f3154e809d@noreply.gitlab.com"
2227
git clone https://isis-codebuild-ci:$GITLAB_TOKEN@code.usgs.gov/astrogeology/isis-codebuild-ci.git
2328
cd isis-codebuild-ci
24-
git checkout -b PR_$PR_NUMBER
29+
git checkout -b $REF_NAME
2530
echo -e "\nenv: \n shell: bash \n variables: \n PR_NUMBER: $PR_NUMBER \n MERGE_BRANCH: $GITHUB_BASE_REF" >> buildspec.yml
26-
git commit -a -m "$PR_NUMBER"
27-
git push origin PR_$PR_NUMBER --force
31+
git commit -a -m "$REF_NAME"
32+
git push origin $REF_NAME --force
2833
2934
comment-bot:
3035
permissions: write-all
@@ -42,4 +47,4 @@ jobs:
4247
To view your [build log](https://us-west-2.codebuild.aws.amazon.com/project/eyJlbmNyeXB0ZWREYXRhIjoiNDJNZ2MxbHFKTkwxV1RyQUxJekdJY3FIanNqU29rMHB4Nk1YUzk4REIrZUZDeEtEaW9HQlZ1dTZOSHpML2VUTGVDekYydmVFcU9sUHJKN20wQzd1Q0UzSzJscnB0MElDb1M3Ti9GTlJYR1RuMWJTV3V1SkJTa3NoYmc9PSIsIml2UGFyYW1ldGVyU3BlYyI6IjF3U2NTSGlDcEtCc29YVnEiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D), please reference the build with source version: "PR_${{ github.event.number }}".
4348
4449
Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch.
45-
50+

0 commit comments

Comments
 (0)