From ab371e011300a0eac7a5c127f1837dee7489efb8 Mon Sep 17 00:00:00 2001 From: Patrick Kelly <patrick.kelly.22@us.af.mil> Date: Mon, 26 Sep 2022 09:55:55 -0500 Subject: [PATCH 01/14] mirror pull test --- githubmirrortest.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 githubmirrortest.txt diff --git a/githubmirrortest.txt b/githubmirrortest.txt new file mode 100644 index 0000000..3b18e51 --- /dev/null +++ b/githubmirrortest.txt @@ -0,0 +1 @@ +hello world -- GitLab From 3342c26205db1d5da40f74a11e818342d9a68026 Mon Sep 17 00:00:00 2001 From: "Mr. Snake" <46388252+SnekCode@users.noreply.github.com> Date: Mon, 26 Sep 2022 11:39:56 -0500 Subject: [PATCH 02/14] Create mirror.yml --- .github/workflows/mirror.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/mirror.yml diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml new file mode 100644 index 0000000..f2e5d6f --- /dev/null +++ b/.github/workflows/mirror.yml @@ -0,0 +1,24 @@ +# This is a basic workflow to help you get started with Actions + +name: Gitlab Pull Trigger + +# Controls when the workflow will run +on: + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: +# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it +# - uses: actions/checkout@v3 + + # Runs a single command using the runners shell + - name: Gitlab Pull Trigger + run: curl --request POST --header "PRIVATE-TOKEN:${{secrets.GITLAB_ACCESS_TOKEN}}" "https://repo1.dso.mil/api/v4/projects/${{secrets.GITLAB_PROJECT_ID}}/mirror/pull" -- GitLab From bef6ea06cb46cc707970bfe13bc858f7b15c88e1 Mon Sep 17 00:00:00 2001 From: "Mr. Snake" <46388252+SnekCode@users.noreply.github.com> Date: Mon, 26 Sep 2022 11:43:58 -0500 Subject: [PATCH 03/14] Adding fail clause to mirror update --- .github/workflows/mirror.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index f2e5d6f..0cbbf41 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -21,4 +21,4 @@ jobs: # Runs a single command using the runners shell - name: Gitlab Pull Trigger - run: curl --request POST --header "PRIVATE-TOKEN:${{secrets.GITLAB_ACCESS_TOKEN}}" "https://repo1.dso.mil/api/v4/projects/${{secrets.GITLAB_PROJECT_ID}}/mirror/pull" + run: curl --fail --request POST --header "PRIVATE-TOKEN:${{secrets.GITLAB_ACCESS_TOKEN}}" "https://repo1.dso.mil/api/v4/projects/${{secrets.GITLAB_PROJECT_ID}}/mirror/pull" -- GitLab From 768738bd7e55afc47b0f6c219e9036517b068bda Mon Sep 17 00:00:00 2001 From: "Mr. Snake" <46388252+SnekCode@users.noreply.github.com> Date: Mon, 26 Sep 2022 11:54:48 -0500 Subject: [PATCH 04/14] Update gitlab mirror workflow to trigger on push and pull_requests --- .github/workflows/mirror.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 0cbbf41..41a7775 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -3,14 +3,12 @@ name: Gitlab Pull Trigger # Controls when the workflow will run -on: - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: +on: [push, pull_request, workflow_dispatch] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - build: + Gitlab_Mirror: # The type of runner that the job will run on runs-on: ubuntu-latest -- GitLab From 7ec6ab6b1b38bc19a936d5cb622666b8616a8d76 Mon Sep 17 00:00:00 2001 From: "Mr. Snake" <46388252+SnekCode@users.noreply.github.com> Date: Mon, 26 Sep 2022 11:57:01 -0500 Subject: [PATCH 05/14] correction to curl command --- .github/workflows/mirror.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 41a7775..2d16788 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -19,4 +19,4 @@ jobs: # Runs a single command using the runners shell - name: Gitlab Pull Trigger - run: curl --fail --request POST --header "PRIVATE-TOKEN:${{secrets.GITLAB_ACCESS_TOKEN}}" "https://repo1.dso.mil/api/v4/projects/${{secrets.GITLAB_PROJECT_ID}}/mirror/pull" + run: curl --fail --request POST --header "PRIVATE-TOKEN: ${{secrets.GITLAB_ACCESS_TOKEN}}" "https://repo1.dso.mil/api/v4/projects/${{secrets.GITLAB_PROJECT_ID}}/mirror/pull" -- GitLab From bd939981291855b0d357534cf0dcd3ba9a60d305 Mon Sep 17 00:00:00 2001 From: "Mr. Snake" <46388252+SnekCode@users.noreply.github.com> Date: Mon, 26 Sep 2022 12:00:52 -0500 Subject: [PATCH 06/14] syntax correction ln23 --- .github/workflows/mirror.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 2d16788..970b5b8 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -19,4 +19,5 @@ jobs: # Runs a single command using the runners shell - name: Gitlab Pull Trigger - run: curl --fail --request POST --header "PRIVATE-TOKEN: ${{secrets.GITLAB_ACCESS_TOKEN}}" "https://repo1.dso.mil/api/v4/projects/${{secrets.GITLAB_PROJECT_ID}}/mirror/pull" + run: | + curl --fail --request POST --header "PRIVATE-TOKEN: ${{secrets.GITLAB_ACCESS_TOKEN}}" --url "https://repo1.dso.mil/api/v4/projects/${{secrets.GITLAB_PROJECT_ID}}/mirror/pull" -- GitLab From c5757c81a510eb8f88cedf9b041bc577aca80a14 Mon Sep 17 00:00:00 2001 From: "Mr. Snake" <46388252+SnekCode@users.noreply.github.com> Date: Wed, 16 Nov 2022 10:34:10 -0600 Subject: [PATCH 07/14] Update mirror.yml --- .github/workflows/mirror.yml | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 970b5b8..d34a4de 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -1,23 +1,20 @@ -# This is a basic workflow to help you get started with Actions +name: Mirror and Run Gitlab CI -name: Gitlab Pull Trigger - -# Controls when the workflow will run on: [push, pull_request, workflow_dispatch] -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" - Gitlab_Mirror: - # The type of runner that the job will run on + build: runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job steps: -# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it -# - uses: actions/checkout@v3 - - # Runs a single command using the runners shell - - name: Gitlab Pull Trigger - run: | - curl --fail --request POST --header "PRIVATE-TOKEN: ${{secrets.GITLAB_ACCESS_TOKEN}}" --url "https://repo1.dso.mil/api/v4/projects/${{secrets.GITLAB_PROJECT_ID}}/mirror/pull" + - uses: actions/checkout@v1 + - name: Mirror + trigger CI + uses: SvanBoxel/gitlab-mirror-and-ci-action@master + with: + args: "https://gitlab.com/<namespace>/<repository>" + env: + FORCE_PUSH: "false" + GITLAB_HOSTNAME: "gitlab.com" + GITLAB_USERNAME: "svboxel" + GITLAB_PASSWORD: ${{ secrets.GITLAB_ACCESS_TOKEN }} + GITLAB_PROJECT_ID: ${{ secrets.GITLAB_PROJECT_ID }} + GITHUB_TOKEN: ${{ secrets.GITLAB_ACCESS_TOKEN }} -- GitLab From ad92285ea8ca57ab6cdd35ae071be79b809b7529 Mon Sep 17 00:00:00 2001 From: "Mr. Snake" <46388252+SnekCode@users.noreply.github.com> Date: Wed, 16 Nov 2022 10:44:37 -0600 Subject: [PATCH 08/14] Update mirror.yml --- .github/workflows/mirror.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index d34a4de..e240b49 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -8,13 +8,13 @@ jobs: steps: - uses: actions/checkout@v1 - name: Mirror + trigger CI - uses: SvanBoxel/gitlab-mirror-and-ci-action@master + uses: DoD-Platform-One/gitlab-mirror-and-ci-action@master with: args: "https://gitlab.com/<namespace>/<repository>" env: FORCE_PUSH: "false" - GITLAB_HOSTNAME: "gitlab.com" - GITLAB_USERNAME: "svboxel" + GITLAB_HOSTNAME: "repo1.dso.mil" + GITLAB_USERNAME: "snekcode" GITLAB_PASSWORD: ${{ secrets.GITLAB_ACCESS_TOKEN }} GITLAB_PROJECT_ID: ${{ secrets.GITLAB_PROJECT_ID }} GITHUB_TOKEN: ${{ secrets.GITLAB_ACCESS_TOKEN }} -- GitLab From b4890e19b64f25e2c843cbcfa03f5c0b28a1090f Mon Sep 17 00:00:00 2001 From: "Mr. Snake" <46388252+SnekCode@users.noreply.github.com> Date: Wed, 16 Nov 2022 10:49:26 -0600 Subject: [PATCH 09/14] adding repo url secret --- .github/workflows/mirror.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index e240b49..2da1934 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -10,7 +10,7 @@ jobs: - name: Mirror + trigger CI uses: DoD-Platform-One/gitlab-mirror-and-ci-action@master with: - args: "https://gitlab.com/<namespace>/<repository>" + args: ${{ secrets.GITLAB_REPO_URL }} env: FORCE_PUSH: "false" GITLAB_HOSTNAME: "repo1.dso.mil" -- GitLab From fee42e743fe4813bdf9bb08f62fd573ed4e56eba Mon Sep 17 00:00:00 2001 From: "Mr. Snake" <46388252+SnekCode@users.noreply.github.com> Date: Wed, 16 Nov 2022 13:06:21 -0600 Subject: [PATCH 10/14] Update mirror.yml --- .github/workflows/mirror.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 2da1934..cda8bf4 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -10,7 +10,7 @@ jobs: - name: Mirror + trigger CI uses: DoD-Platform-One/gitlab-mirror-and-ci-action@master with: - args: ${{ secrets.GITLAB_REPO_URL }} + args: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/podinfo.git env: FORCE_PUSH: "false" GITLAB_HOSTNAME: "repo1.dso.mil" -- GitLab From 0722d83388884ecacd11d00569553cb45bfdfffc Mon Sep 17 00:00:00 2001 From: "Mr. Snake" <46388252+SnekCode@users.noreply.github.com> Date: Wed, 16 Nov 2022 14:13:47 -0600 Subject: [PATCH 11/14] Testing Comment workflow --- .github/workflows/Comment.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/Comment.yml diff --git a/.github/workflows/Comment.yml b/.github/workflows/Comment.yml new file mode 100644 index 0000000..9234fc7 --- /dev/null +++ b/.github/workflows/Comment.yml @@ -0,0 +1,21 @@ +name: "Comment test" +on: + issue_comment: + types: [created, edited] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Mirror + trigger CI + uses: DoD-Platform-One/gitlab-mirror-and-ci-action@master + with: + args: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/podinfo.git + env: + FORCE_PUSH: "false" + GITLAB_HOSTNAME: "repo1.dso.mil" + GITLAB_USERNAME: "snekcode" + GITLAB_PASSWORD: ${{ secrets.GITLAB_ACCESS_TOKEN }} + GITLAB_PROJECT_ID: ${{ secrets.GITLAB_PROJECT_ID }} + GITHUB_TOKEN: ${{ secrets.GITLAB_ACCESS_TOKEN }} -- GitLab From c076f45440d73d6b86f161bb4ae49a01345072f4 Mon Sep 17 00:00:00 2001 From: Micah Nagel <micah.nagel@defenseunicorns.com> Date: Wed, 16 Nov 2022 14:00:28 -0700 Subject: [PATCH 12/14] Update Comment.yml --- .github/workflows/Comment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Comment.yml b/.github/workflows/Comment.yml index 9234fc7..b993750 100644 --- a/.github/workflows/Comment.yml +++ b/.github/workflows/Comment.yml @@ -1,7 +1,7 @@ name: "Comment test" on: - issue_comment: - types: [created, edited] + pull_request_review: + types: [submitted] jobs: build: -- GitLab From 8c1ab88b11e66e493e7e0ef9d76f7fe298823f8a Mon Sep 17 00:00:00 2001 From: Micah Nagel <micah.nagel@defenseunicorns.com> Date: Wed, 16 Nov 2022 14:09:29 -0700 Subject: [PATCH 13/14] Update Comment.yml --- .github/workflows/Comment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Comment.yml b/.github/workflows/Comment.yml index b993750..19a3ec7 100644 --- a/.github/workflows/Comment.yml +++ b/.github/workflows/Comment.yml @@ -1,7 +1,7 @@ name: "Comment test" on: - pull_request_review: - types: [submitted] + pull_request_target: + types: [ready_for_review] jobs: build: -- GitLab From 3458fbaaa85643d35a2e9518d26019f953253b07 Mon Sep 17 00:00:00 2001 From: Micah Nagel <micah.nagel@defenseunicorns.com> Date: Wed, 16 Nov 2022 14:14:10 -0700 Subject: [PATCH 14/14] Update Comment.yml --- .github/workflows/Comment.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Comment.yml b/.github/workflows/Comment.yml index 19a3ec7..87a4e0c 100644 --- a/.github/workflows/Comment.yml +++ b/.github/workflows/Comment.yml @@ -1,10 +1,11 @@ name: "Comment test" on: - pull_request_target: - types: [ready_for_review] + pull_request_review: + types: [submitted] jobs: build: + if: github.event.review.state == 'approved' runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 -- GitLab