Skip to content

Commit

Permalink
ci: improved github action
Browse files Browse the repository at this point in the history
  • Loading branch information
demartis committed Nov 15, 2023
1 parent 8026a47 commit 7b4291a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/sub_description.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Update repo description
uses: peter-evans/dockerhub-description@v3
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/sub_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ on:
required: true

env:
TEST_TAG: test
TEST_TAG: test_${{ inputs.DOCKERHUB_TAG }}

jobs:
build:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
images: ${{ inputs.DOCKERHUB_REPO }}

-
name: Build and push :test
name: Build and push :${{ env.TEST_TAG }}
uses: docker/build-push-action@v5
with:
context: ./${{ inputs.DOCKER_CONTEXT }}
Expand All @@ -87,7 +87,12 @@ jobs:
run: |
docker run --rm ${{ inputs.DOCKERHUB_REPO }}:${{ env.TEST_TAG }}
-
name: Build and push :${{ inputs.DOCKERHUB_TAG }} ${{ inputs.is_latest == true && 'and :latest' || '' }} ${{ inputs.is_latest_meshlab == true && 'and :latest-meshlab' || '' }}
name: Image MCR Version Check Test
run: |
docker run --rm ${{ inputs.DOCKERHUB_REPO }}:${{ env.TEST_TAG }} cat $MCR_MASTER_PATH/VersionInfo.xml
-
name: Build and push (cached) :${{ inputs.DOCKERHUB_TAG }} ${{ inputs.is_latest == true && 'and :latest' || '' }} ${{ inputs.is_latest_meshlab == true && 'and :latest-meshlab' || '' }}
uses: docker/build-push-action@v5
with:
context: ./${{ inputs.DOCKER_CONTEXT }}
Expand All @@ -108,16 +113,10 @@ jobs:
# rm -rf /tmp/.buildx-cache
# mv /tmp/.buildx-cache-new /tmp/.buildx-cache

-
name: Inspect (Temp skipped)
continue-on-error: true
run: |
docker image inspect ${{ inputs.DOCKERHUB_REPO }}:${{ inputs.DOCKERHUB_TAG }}
-
name: MCR Version check
continue-on-error: false
run: |
docker run --rm ${{ inputs.DOCKERHUB_REPO }}:${{ inputs.DOCKERHUB_TAG }} echo "${MCR_MASTER_PATH}/VersionInfo.xml"
docker run --rm ${{ inputs.DOCKERHUB_REPO }}:${{ inputs.DOCKERHUB_TAG }} cat $MCR_MASTER_PATH/VersionInfo.xml
-
name: MCR Test (Temp skipped)
continue-on-error: true
Expand Down

0 comments on commit 7b4291a

Please sign in to comment.