Merge pull request #4 from michalfita/chore/2/rename-the-project

[FIxes #2] Prepare the repository rename
michalfita · Dec 26, 2023 · ed4c68a · ed4c68a
2 parents 23a4876 + f7181a0
commit ed4c68a
Show file tree

Hide file tree

Showing 41 changed files with 162 additions and 146 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -34,27 +34,27 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            mkaczanowski/packer-builder-arm
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=match,pattern=v(.*),group=1
+      #- name: Docker meta
+      #  id: meta
+      #  uses: docker/metadata-action@v5
+      #  with:
+      #    images: |
+      #      mkaczanowski/packer-builder-arm
+      #    tags: |
+      #      type=ref,event=branch
+      #      type=ref,event=pr
+      #      type=match,pattern=v(.*),group=1
 
       #### build+export, test only on PRs
-      - name: Build and export to Docker
-        if: github.event_name == 'pull_request'
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: docker/Dockerfile
-          load: true
-          tags: packer-builder-arm:test
-          labels: ${{ steps.meta.outputs.labels }}
+      #- name: Build and export to Docker
+      #  if: github.event_name == 'pull_request'
+      #  uses: docker/build-push-action@v5
+      #  with:
+      #    context: .
+      #    file: docker/Dockerfile
+      #    load: true
+      #    tags: packer-plugin-cross:test
+      #    labels: ${{ steps.meta.outputs.labels }}
 
       - name: Install packer plugins
         if: github.event_name == 'pull_request'
@@ -69,12 +69,12 @@ jobs:
           du -h --apparent-size raspberry-pi-4.img
       ####
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+      # - name: Login to DockerHub
+      #  uses: docker/login-action@v3
+      #  if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')
+      #  with:
+      #    username: ${{ secrets.DOCKER_USER }}
+      #    password: ${{ secrets.DOCKER_PASSWORD }}
 
       # - name: Login to GitHub Container Registry
       #   uses: docker/login-action@v3
@@ -83,22 +83,22 @@ jobs:
       #     username: ${{ github.repository_owner }}
       #     password: ${{ secrets.GHCR_IO_REGISTRY_TOKEN }}
 
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') }}
-        with:
-          context: .
-          file: docker/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+      #- name: Build and push
+      #  uses: docker/build-push-action@v5
+      #  if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') }}
+      #  with:
+      #    context: .
+      #    file: docker/Dockerfile
+      #    platforms: linux/amd64,linux/arm64
+      #    push: true
+      #    tags: ${{ steps.meta.outputs.tags }}
+      #    labels: ${{ steps.meta.outputs.labels }}
 
-      - name: Update description
-        uses: peter-evans/dockerhub-description@v3
-        if: github.ref == 'refs/heads/master'
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          short-description: Packer plugin to build ARM images
-          readme-filepath: ./README.md
+      #- name: Update description
+      #  uses: peter-evans/dockerhub-description@v3
+      #  if: github.ref == 'refs/heads/master'
+      #  with:
+      #    username: ${{ secrets.DOCKER_USER }}
+      #    password: ${{ secrets.DOCKER_PASSWORD }}
+      #    short-description: Packer plugin to build ARM images
+      #    readme-filepath: ./README.md
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20
       - name: Describe plugin
         id: plugin_describe
         run: echo "api_version=$(go run . describe | jq -r '.api_version')" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
         id: cache-key
         uses: actions/cache@v3
         with:
-          path: packer-builder-arm
+          path: packer-plugin-cross
           key: key-${{ github.sha }}-1
 
       - name: Checkout
@@ -50,7 +50,7 @@ jobs:
         if: steps.cache-key.outputs.cache-hit != 'true'
         uses: actions/cache@v3
         with:
-          path: packer-plugin-arm
+          path: packer-plugin-cross
           key: key-${{ github.sha }}-1
 
   test:
@@ -100,7 +100,7 @@ jobs:
       - name: Retrieve cache
         uses: actions/cache@v3
         with:
-          path: packer-plugin-arm
+          path: packer-plugin-cross
           key: key-${{ github.sha }}-1
 
       - name: Install packer plugins
@@ -147,31 +147,31 @@ jobs:
           git archive -o repo.tar.gz HEAD
           vagrant upload repo.tar.gz /home/vagrant/repo.tar.gz
           vagrant ssh -c " \
-            rm -rf packer-builder-arm && \
-            mkdir packer-builder-arm && \
-            tar -xf repo.tar.gz -C packer-builder-arm \
+            rm -rf packer-plugin-cross && \
+            mkdir packer-plugin-cross && \
+            tar -xf repo.tar.gz -C packer-plugin-cross \
           "
 
       - name: Retrieve cache
         uses: actions/cache@v3
         with:
-          path: packer-plugin-arm
+          path: packer-plugin-cross
           key: key-${{ github.sha }}-1
 
       - name: Upload packer-build-arm binary
         run: |
-          vagrant upload packer-plugin-arm /home/vagrant/packer-builder-arm/packer-plugin-arm
+          vagrant upload packer-plugin-cross /home/vagrant/packer-plugin-cross/packer-plugin-cross
 
       - name: Build board
         run: |
           vagrant ssh -c " \
-            cd packer-builder-arm && \
+            cd packer-plugin-cross && \
             sudo PACKER_LOG=1 packer build boards/raspberry-pi-3/archlinuxarm.json \
           "
 
       - name: Check result
         run: |
-          vagrant ssh -c "ls -al packer-builder-arm/raspberry-pi-3.img"
+          vagrant ssh -c "ls -al packer-plugin-cross/raspberry-pi-3.img"
 
   plugin-check:
     needs: compile
@@ -184,7 +184,7 @@ jobs:
       - name: Retrieve cache
         uses: actions/cache@v3
         with:
-          path: packer-plugin-arm
+          path: packer-plugin-cross
           key: key-${{ github.sha }}-1
       - name: check
         run: |

diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@
 packer_cache
 packer-builder-arm
 packer-plugin-arm
+packer-plugin-cross
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -15,6 +15,7 @@ builds:
     goarch:
       - amd64
       - arm64
+      - riscv64
     binary: '{{ .ProjectName }}_v{{ .Version }}_{{ .Env.API_VERSION }}_{{ .Os }}_{{ .Arch }}'
 archives:
 - format: zip

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-NAME=arm
+NAME=cross
 BINARY=packer-plugin-${NAME}
 
 HASHICORP_PACKER_PLUGIN_SDK_VERSION?=$(shell go list -m github.com/hashicorp/packer-plugin-sdk | cut -d " " -f2)