Skip to content

Commit

Permalink
Merge branch 'main' into ws
Browse files Browse the repository at this point in the history
  • Loading branch information
MamoruDS committed Jun 25, 2024
2 parents ce8a11d + 6192f63 commit be67167
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ctr_workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
outputs:
targets: ${{ steps.set-data.outputs.targets }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: set-data
working-directory: ./CTR_WORKSPACE
run: |
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
outputs1: ${{ github.repository_owner }}
outputs2: ${{ github.actor }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Login
if: ${{ !env.ACT }}
uses: docker/#-action@v2
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
fi
- name: Build
if: ${{ !env.ACT && !fromJSON(github.event.inputs.is_matrix_test) && env.EXTRA_TAGS }}
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
context: ./CTR_WORKSPACE
file: ${{ matrix.dockerfile }}
Expand All @@ -111,4 +111,3 @@ jobs:
build-args: |
BASE_UBUNTU=${{ matrix.base_ubuntu }}
CUDA_VER=${{ matrix.cuda_version }}
CUDNN_VER=${{ matrix.cudnn_version }}
6 changes: 3 additions & 3 deletions .github/workflows/ctr_workspace_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
outputs:
targets: ${{ steps.set-data.outputs.targets }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: set-data
working-directory: ./CTR_WORKSPACE
run: |
Expand All @@ -46,7 +46,7 @@ jobs:
REGISTRY: ghcr.io
IMAGE_NAME: workspace
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Downcase Repo
run: |
echo "REPO=${GITHUB_REPOSITORY_OWNER,,}/${IMAGE_NAME,,}" >> ${GITHUB_ENV}
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
fi
- name: Build
if: ${{ !fromJSON(github.event.inputs.is_matrix_test) && env.EXTRA_TAGS }}
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
context: ./CTR_WORKSPACE
file: ${{ matrix.dockerfile }}
Expand Down

0 comments on commit be67167

Please # to comment.