misc: test

IRNAS · Jul 5, 2024 · a0debd7 · a0debd7
1 parent 0bff18f
commit a0debd7
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 37 deletions.
diff --git a/.github/workflows/build-and-publish-vanilla-zephyr.yaml b/.github/workflows/build-and-publish-vanilla-zephyr.yaml
@@ -1,9 +1,11 @@
 name: Build and publish a Vanilla Zephyr Docker images
 
 on:
-  push:
-    tags:
-      - "v*"
+  workflow_call:
+    inputs:
+      release_version:
+        required: true
+        type: string
 
 env:
   REGISTRY: ghcr.io
@@ -37,41 +39,55 @@ jobs:
           username: ${{github.actor}}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata for CI image
-        id: meta-ci
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-ci
-
-      - name: Extract metadata for Dev image
-        id: meta-dev
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-dev
+      # - name: Extract metadata for CI image
+      #   id: meta-ci
+      #   uses: docker/metadata-action@v5
+      #   with:
+      #     images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-ci
+      #
+      # - name: Extract metadata for Dev image
+      #   id: meta-dev
+      #   uses: docker/metadata-action@v5
+      #   with:
+      #     images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-dev
 
-      - name: Build and push CI image
-        id: push-ci
-        uses: docker/build-push-action@v5
-        with:
-          file: ./vanilla-zephyr/Dockerfile.ci
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta-ci.outputs.tags }}
-          labels: ${{ steps.meta-ci.outputs.labels }}
-          build-args: |
-            ZEPHYR_VERSION=${{ matrix.variant.zephyr_version }}
-            MCUBOOT_VERSION=${{ matrix.variant.mcuboot_version }}
-
-      - name: Build and push Dev image
+      - name: Build and push test image
         id: push-dev
         uses: docker/build-push-action@v5
         with:
-          file: ./vanilla-zephyr/Dockerfile.dev
-          platforms: linux/amd64,linux/arm64
+          file: ./Dockerfile
           push: true
-          tags: ${{ steps.meta-dev.outputs.tags }}
-          labels: ${{ steps.meta-dev.outputs.labels }}
-          build-args: |
-            ZEPHYR_VERSION=${{ matrix.variant.zephyr_version }}
-            MCUBOOT_VERSION=${{ matrix.variant.mcuboot_version }}
-            BASE_IMAGE=${{ steps.meta-ci.outputs.tags }}
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-test:${{ inputs.release_version }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-test:latest
+          # build-args: |
+          #   ZEPHYR_VERSION=${{ matrix.variant.zephyr_version }}
+          #   MCUBOOT_VERSION=${{ matrix.variant.mcuboot_version }}
+          #   BASE_IMAGE=${{ steps.meta-ci.outputs.tags }}
+
+      # - name: Build and push CI image
+      #   id: push-ci
+      #   uses: docker/build-push-action@v5
+      #   with:
+      #     file: ./vanilla-zephyr/Dockerfile.ci
+      #     platforms: linux/amd64,linux/arm64
+      #     push: true
+      #     tags: ${{ steps.meta-ci.outputs.tags }}
+      #     labels: ${{ steps.meta-ci.outputs.labels }}
+      #     build-args: |
+      #       ZEPHYR_VERSION=${{ matrix.variant.zephyr_version }}
+      #       MCUBOOT_VERSION=${{ matrix.variant.mcuboot_version }}
+
+      # - name: Build and push Dev image
+      #   id: push-dev
+      #   uses: docker/build-push-action@v5
+      #   with:
+      #     file: ./vanilla-zephyr/Dockerfile.dev
+      #     platforms: linux/amd64,linux/arm64
+      #     push: true
+      #     tags: ${{ steps.meta-dev.outputs.tags }}
+      #     labels: ${{ steps.meta-dev.outputs.labels }}
+      #     build-args: |
+      #       ZEPHYR_VERSION=${{ matrix.variant.zephyr_version }}
+      #       MCUBOOT_VERSION=${{ matrix.variant.mcuboot_version }}
+      #       BASE_IMAGE=${{ steps.meta-ci.outputs.tags }}
diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
@@ -14,7 +14,6 @@ env:
 jobs:
   update-changelog:
     runs-on: ubuntu-22.04
-    # runs-on: self-hosted
 
     steps:
       - name: Checkout Repository
@@ -63,3 +62,9 @@ jobs:
     uses: ./.github/workflows/publish-release.yaml
     with:
       release_version: ${{ inputs.version }}
+
+  call-build-publish:
+    needs: update-changelog
+    uses: ./.github/workflows/build-and-publish-vanilla-zephyr.yaml
+    with:
+      release_version: ${{ inputs.version }}
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,2 @@
+FROM alpine
+CMD ["/bin/sh", "-c", "echo 'hello world'"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		FROM alpine
		CMD ["/bin/sh", "-c", "echo 'hello world'"]