Skip to content

Commit e55a2fb

Browse files
committed
Cleanup actions
1 parent 4ece18c commit e55a2fb

2 files changed

Lines changed: 13 additions & 15 deletions

File tree

.github/workflows/deploy_to_development.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: Deploy to Development
22

3-
# Only one workflow in a concurrency group may run at a time
43
concurrency:
54
group: development-concurrency
65
cancel-in-progress: true
@@ -25,8 +24,8 @@ jobs:
2524
SHA_SHORT=$(echo ${{ github.sha }} | cut -c1-8)
2625
echo "tag=$SHA_SHORT" >> "$GITHUB_OUTPUT"
2726
28-
build-and-push-isar-robot-dev-image-to-ghcr:
29-
name: Build and push isar-robot dev image to github container registry
27+
build-and-push-dev-image-to-ghcr:
28+
name: Build and push dev image to github container registry
3029
needs: get-short-sha
3130
uses: equinor/armada/.github/workflows/build_and_publish_docker_image_to_container_registry.yml@main
3231
permissions:
@@ -35,8 +34,8 @@ jobs:
3534
with:
3635
registry: ghcr.io
3736
image_name: ${{ github.repository }}
38-
tag: "dev.${{ needs.get-short-sha.outputs.tag }}" # PS: Needs to match deploy.with.Tag
39-
secondary_tag: "dev"
37+
tag: "dev.${{ needs.get-short-sha.outputs.tag }}"
38+
secondary_tag: dev
4039
path_to_dockerfile: Dockerfile
4140
path_to_context: .
4241
secrets:
@@ -45,13 +44,13 @@ jobs:
4544

4645
deploy:
4746
name: Update deployment in Development
48-
needs: [build-and-push-isar-robot-dev-image-to-ghcr, get-short-sha]
47+
needs: [build-and-push-dev-image-to-ghcr, get-short-sha]
4948
uses: ./.github/workflows/update_aurora_deployment.yml
5049
with:
5150
Environment: development
5251
Registry: ghcr.io
5352
ImageName: ${{ github.repository }}
54-
Tag: "dev.${{ needs.get-short-sha.outputs.tag }}" # PS: Needs to match build-and-push-components.with.Tag
53+
Tag: "dev.${{ needs.get-short-sha.outputs.tag }}"
5554
AuthorEmail: ${{ github.event.head_commit.author.email }}
5655
AuthorName: ${{ github.event.head_commit.author.name }}
5756
secrets:

.github/workflows/deploy_to_staging.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: Deploy to Staging
22

3-
# Only one workflow in a concurrency group may run at a time
43
concurrency:
54
group: staging-concurrency
65
cancel-in-progress: true
@@ -14,8 +13,8 @@ on:
1413
types: [published]
1514

1615
jobs:
17-
build-and-push-isar-robot-latest-release-image-to-ghcr:
18-
name: Build and push isar-robot latest release image to github container registry
16+
build-and-push-latest-release-image-to-ghcr:
17+
name: Build and push latest release image to github container registry
1918
uses: equinor/armada/.github/workflows/build_and_publish_docker_image_to_container_registry.yml@main
2019
permissions:
2120
contents: read
@@ -31,8 +30,8 @@ jobs:
3130
registry_password: ${{ secrets.GITHUB_TOKEN }}
3231
registry_username: ${{ github.actor }}
3332

34-
build-and-push-isar-robot-latest-release-image-to-aurora-dev-registry:
35-
name: Build and push isar-robot latest release image to aurora dev registry
33+
build-and-push-latest-release-image-to-aurora-dev-registry:
34+
name: Build and push latest release image to aurora dev registry
3635
uses: equinor/armada/.github/workflows/build_and_publish_docker_image_to_container_registry.yml@main
3736
permissions:
3837
contents: read
@@ -48,8 +47,8 @@ jobs:
4847
registry_password: ${{ secrets.ROBOTICS_ACRPUSH_DOCKER_SECRET }}
4948
registry_username: ${{ secrets.ROBOTICS_ACRPUSH_DOCKER_APPLICATION_ID }}
5049

51-
build-and-push-isar-robot-latest-release-image-to-aurora-prod-registry:
52-
name: Build and push isar-robot latest release image to aurora prod registry
50+
build-and-push-latest-release-image-to-aurora-prod-registry:
51+
name: Build and push latest release image to aurora prod registry
5352
uses: equinor/armada/.github/workflows/build_and_publish_docker_image_to_container_registry.yml@main
5453
permissions:
5554
contents: read
@@ -67,7 +66,7 @@ jobs:
6766

6867
deploy:
6968
name: Update deployment in Staging
70-
needs: build-and-push-isar-robot-latest-release-image-to-aurora-prod-registry
69+
needs: build-and-push-latest-release-image-to-aurora-prod-registry
7170
uses: ./.github/workflows/update_aurora_deployment.yml
7271
with:
7372
Environment: staging

0 commit comments

Comments
 (0)