From 921deba34e44a05eadeb512504957999d2672b81 Mon Sep 17 00:00:00 2001 From: "tomoya.kimura" Date: Tue, 1 Feb 2022 11:07:25 +0900 Subject: [PATCH 1/3] add ci to sync tier4/universe --- .github/workflows/sync-upstream.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index 934cb0bb9..86e81b7e1 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -6,9 +6,9 @@ on: workflow_dispatch: env: - UPSTREAM_REPO: https://github.com/tier4/autoware_launcher.git - BASE_BRANCH: main - SYNC_TARGET_BRANCH: main + UPSTREAM_REPO: https://github.com/tier4/AutowareArchitectureProposal_launcher.git + BASE_BRANCH: tier4/universe + SYNC_TARGET_BRANCH: tier4/universe SYNC_BRANCH: sync-upstream jobs: @@ -33,7 +33,7 @@ jobs: run: | git config --local --unset-all http.https://github.com/.extraheader || true git config --global url.https://x-access-token:${{ steps.generate-token.outputs.token }}@github.com.insteadOf 'https://github.com' - + - name: Fetch upstream run: | git remote add upstream "${{ env.UPSTREAM_REPO }}" From 6591e01c0db54588b844f39ce38f734caded5cf3 Mon Sep 17 00:00:00 2001 From: "tomoya.kimura" Date: Tue, 1 Feb 2022 11:10:13 +0900 Subject: [PATCH 2/3] misc --- .github/workflows/sync-upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index 86e81b7e1..e9b06c722 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -33,7 +33,7 @@ jobs: run: | git config --local --unset-all http.https://github.com/.extraheader || true git config --global url.https://x-access-token:${{ steps.generate-token.outputs.token }}@github.com.insteadOf 'https://github.com' - + - name: Fetch upstream run: | git remote add upstream "${{ env.UPSTREAM_REPO }}" From 8875abfc3d5201560ec77f5727cdc6a41973814d Mon Sep 17 00:00:00 2001 From: "tomoya.kimura" Date: Tue, 1 Feb 2022 11:26:23 +0900 Subject: [PATCH 3/3] update upstream repositry --- .github/workflows/sync-upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index e9b06c722..a27daa46f 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: env: - UPSTREAM_REPO: https://github.com/tier4/AutowareArchitectureProposal_launcher.git + UPSTREAM_REPO: https://github.com/tier4/autoware_launch.git BASE_BRANCH: tier4/universe SYNC_TARGET_BRANCH: tier4/universe SYNC_BRANCH: sync-upstream