fix

openimsdk · Dec 3, 2024 · 4b25f5e · 4b25f5e
1 parent f807d20
commit 4b25f5e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 42 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -44,26 +44,6 @@ jobs:
           username: ${{ secrets.ALIREGISTRY_USERNAME }}
           password: ${{ secrets.ALIREGISTRY_TOKEN }}
 
-      # - name: Extract version
-      #   if: github.event_name == 'release'
-      #   id: extract_version_release
-      #   run: echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-
-      # - name: Set version from workflow_dispatch input
-      #   if: github.event_name == 'workflow_dispatch'
-      #   id: extract_version_dispatch
-      #   run: echo "version=${{ github.event.inputs.tag }}" >> $GITHUB_ENV
-
-      # - name: Set version from branch name
-      #   if: github.event_name == 'push'
-      #   id: extract_version_push
-      #   run: |
-      #     if [[ "${GITHUB_REF}" == refs/heads/release-* ]]; then
-      #       BRANCH_NAME=${GITHUB_REF#refs/heads/}
-      #       VERSION=${BRANCH_NAME#release-}
-      #       echo "version=$VERSION" >> $GITHUB_ENV
-      #     fi
-
       - name: Extract metadata for Docker (tags, labels)
         id: meta
         uses: docker/metadata-action@v5

diff --git a/.github/workflows/docker-new.yml b/.github/workflows/docker-new.yml
@@ -27,10 +27,9 @@ jobs:
         run: |
           images=$(find build/images -mindepth 1 -maxdepth 1 -type d -printf "%f\n")
           
-          images_json=$(echo "$images" | jq -R . | jq -s '{image: .}')
+          images_json=$(echo "$images" | jq -R . | jq -s '{ include: [ .[] | { image: . } ] }')
           
           echo "matrix=$images_json" >> $GITHUB_OUTPUT
-      
 
   build-and-push:
     needs: find-images
@@ -72,26 +71,6 @@ jobs:
           username: ${{ secrets.ALIREGISTRY_USERNAME }}
           password: ${{ secrets.ALIREGISTRY_TOKEN }}
 
-      # - name: Extract version from tag
-      #   if: github.event_name == 'release'
-      #   id: extract_version_release
-      #   run: echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-
-      # - name: Set version from workflow_dispatch input
-      #   if: github.event_name == 'workflow_dispatch'
-      #   id: extract_version_dispatch
-      #   run: echo "version=${{ github.event.inputs.tag }}" >> $GITHUB_ENV
-
-      # - name: Set version from branch name
-      #   if: github.event_name == 'push'
-      #   id: extract_version_push
-      #   run: |
-      #     if [[ "${GITHUB_REF}" == refs/heads/release-* ]]; then
-      #       BRANCH_NAME=${GITHUB_REF#refs/heads/}
-      #       VERSION=${BRANCH_NAME#release-}
-      #       echo "version=$VERSION" >> $GITHUB_ENV
-      #     fi
-
       - name: Extract metadata for Docker (tags, labels)
         id: meta
         uses: docker/metadata-action@v5