Skip to content

Commit b4663ab

Browse files
committed
reordered the run steps
1 parent 8af8cc7 commit b4663ab

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

.github/workflows/content-service.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,27 @@ jobs:
2222
java-version: '11'
2323
cache: 'maven'
2424

25-
# Step 3: Build the project
25+
# Step 3: Set up Login to Docker registry
26+
- name: Registry Login
27+
uses: ./.github/actions/registry-login
28+
with:
29+
registry_provider: ${{ vars.REGISTRY_PROVIDER }}
30+
gcp_service_account_key: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
31+
registry_name: ${{ secrets.REGISTRY_NAME }}
32+
registry_url: ${{ secrets.REGISTRY_URL }}
33+
registry_username: ${{ secrets.REGISTRY_USERNAME }}
34+
registry_password: ${{ secrets.REGISTRY_PASSWORD }}
35+
github_token: ${{ secrets.GITHUB_TOKEN }}
36+
37+
# Step 4: Build the project
2638
- name: Build Content Service
2739
run: |
2840
mvn clean install -DskipTests=true \
2941
-DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
3042
-DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
3143
-DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
3244
33-
# Step 4: Package the project
45+
# Step 5: Package the project
3446
- name: Package Content Service
3547
run: |
3648
cd content-api
@@ -39,18 +51,6 @@ jobs:
3951
-DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
4052
-DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
4153
42-
# Step 5: Set up Login to Docker registry
43-
- name: Registry Login
44-
uses: ./.github/actions/registry-login
45-
with:
46-
registry_provider: ${{ vars.REGISTRY_PROVIDER }}
47-
gcp_service_account_key: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
48-
registry_name: ${{ secrets.REGISTRY_NAME }}
49-
registry_url: ${{ secrets.REGISTRY_URL }}
50-
registry_username: ${{ secrets.REGISTRY_USERNAME }}
51-
registry_password: ${{ secrets.REGISTRY_PASSWORD }}
52-
github_token: ${{ secrets.GITHUB_TOKEN }}
53-
5454
# Step 6: Build Docker image
5555
- name: Build Docker Image
5656
run: |

.github/workflows/search-service.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,27 @@ jobs:
2222
java-version: '11'
2323
cache: 'maven'
2424

25-
# Step 3: Build the project
25+
# Step 3: Set up Login to Docker registry
26+
- name: Registry Login
27+
uses: ./.github/actions/registry-login
28+
with:
29+
registry_provider: ${{ vars.REGISTRY_PROVIDER }}
30+
gcp_service_account_key: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
31+
registry_name: ${{ secrets.REGISTRY_NAME }}
32+
registry_url: ${{ secrets.REGISTRY_URL }}
33+
registry_username: ${{ secrets.REGISTRY_USERNAME }}
34+
registry_password: ${{ secrets.REGISTRY_PASSWORD }}
35+
github_token: ${{ secrets.GITHUB_TOKEN }}
36+
37+
# Step 4: Build the project
2638
- name: Build Search API Service
2739
run: |
2840
mvn clean install -DskipTests=true \
2941
-DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
3042
-DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
3143
-DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
3244
33-
# Step 4: Package the project
45+
# Step 5: Package the project
3446
- name: Package Search API Service
3547
run: |
3648
cd search-api
@@ -39,18 +51,6 @@ jobs:
3951
-DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
4052
-DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
4153
42-
# Step 5: Set up Login to Docker registry
43-
- name: Registry Login
44-
uses: ./.github/actions/registry-login
45-
with:
46-
registry_provider: ${{ vars.REGISTRY_PROVIDER }}
47-
gcp_service_account_key: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
48-
registry_name: ${{ secrets.REGISTRY_NAME }}
49-
registry_url: ${{ secrets.REGISTRY_URL }}
50-
registry_username: ${{ secrets.REGISTRY_USERNAME }}
51-
registry_password: ${{ secrets.REGISTRY_PASSWORD }}
52-
github_token: ${{ secrets.GITHUB_TOKEN }}
53-
5454
# Step 6: Build Docker image
5555
- name: Build Docker Image
5656
run: |

.github/workflows/taxonomy-service.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,27 @@ jobs:
2222
java-version: '11'
2323
cache: 'maven'
2424

25-
# Step 3: Build the project
25+
# Step 3: Set up Login to Docker registry
26+
- name: Registry Login
27+
uses: ./.github/actions/registry-login
28+
with:
29+
registry_provider: ${{ vars.REGISTRY_PROVIDER }}
30+
gcp_service_account_key: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
31+
registry_name: ${{ secrets.REGISTRY_NAME }}
32+
registry_url: ${{ secrets.REGISTRY_URL }}
33+
registry_username: ${{ secrets.REGISTRY_USERNAME }}
34+
registry_password: ${{ secrets.REGISTRY_PASSWORD }}
35+
github_token: ${{ secrets.GITHUB_TOKEN }}
36+
37+
# Step 4: Build the project
2638
- name: Build Taxonomy API Service
2739
run: |
2840
mvn clean install -DskipTests=true \
2941
-DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
3042
-DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
3143
-DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
3244
33-
# Step 4: Package the project
45+
# Step 5: Package the project
3446
- name: Package Taxonomy API Service
3547
run: |
3648
cd taxonomy-api
@@ -39,18 +51,6 @@ jobs:
3951
-DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
4052
-DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
4153
42-
# Step 5: Set up Login to Docker registry
43-
- name: Registry Login
44-
uses: ./.github/actions/registry-login
45-
with:
46-
registry_provider: ${{ vars.REGISTRY_PROVIDER }}
47-
gcp_service_account_key: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
48-
registry_name: ${{ secrets.REGISTRY_NAME }}
49-
registry_url: ${{ secrets.REGISTRY_URL }}
50-
registry_username: ${{ secrets.REGISTRY_USERNAME }}
51-
registry_password: ${{ secrets.REGISTRY_PASSWORD }}
52-
github_token: ${{ secrets.GITHUB_TOKEN }}
53-
5454
# Step 6: Build Docker image
5555
- name: Build Docker Image
5656
run: |

0 commit comments

Comments
 (0)