Merge branch 'install-gh-sed'

inloco · Jan 27, 2023 · 58ab324 · 58ab324
2 parents f530b03 + 8155196
commit 58ab324
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 24 deletions.
diff --git a/.github/workflows/continuous.yaml b/.github/workflows/continuous.yaml
@@ -1,8 +1,5 @@
 name: Continuous
-on:
-  push:
-    branches:
-      - master
+on: push
 permissions:
   contents: read
   id-token: write
@@ -30,8 +27,7 @@ jobs:
         run: cp ./hack/unttify.py /usr/local/bin/unttify
       - name: install and setup casks
         run: |
-          brew search --casks vmware-fusion | grep -q vmware-fusion12 && brew install --cask homebrew/cask-versions/vmware-fusion12 || brew install --cask vmware-fusion
-          brew install --cask packages vagrant vagrant-vmware-utility
+          brew install --cask homebrew/cask-versions/vmware-fusion12 packages vagrant vagrant-vmware-utility
           sh ./hack/kickstart-vmware.sh '${{ secrets.VMWARE_FUSION_SERIAL_NUMBER }}'
           vagrant plugin install vagrant-vmware-desktop
       - name: install and setup formulae
@@ -53,23 +49,8 @@ jobs:
         with:
           aws-region: ${{ secrets.AWS_REGION }}
           role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT }}:role/ecr-public
-      - name: docker login
-        run: |
-          skopeo login -u '${{ secrets.DOCKERHUB_USER }}' -p '${{ secrets.DOCKERHUB_PASS }}' docker.io
-          skopeo login -u '${{ secrets.QUAY_USER }}' -p '${{ secrets.QUAY_PASS }}' quay.io
-          skopeo login -u '${{ github.actor }}' -p '${{ github.token }}' ghcr.io
-          skopeo login -u 'AWS' -p "$(aws ecr-public get-login-password)" public.ecr.aws
       - name: docker push
-        shell: '/usr/bin/env parallel --lb :::: {0}'
         run: |
-          make 'IMAGE_REGISTRY=docker.io' 'IMAGE_REPOSITORY=inloco/mactions' -C oci push
-          make 'IMAGE_REGISTRY=quay.io' 'IMAGE_REPOSITORY=inloco/mactions' -C oci push
-          make 'IMAGE_REGISTRY=ghcr.io' 'IMAGE_REPOSITORY=${{ github.repository }}' -C oci push
+          skopeo login -u 'AWS' -p "$(aws ecr-public get-login-password)" public.ecr.aws
           make 'IMAGE_REGISTRY=public.ecr.aws' 'IMAGE_REPOSITORY=incognia/mactions' -C oci push
-      - name: docker tag
-        shell: '/usr/bin/env parallel --lb :::: {0}'
-        run: |
-          make 'IMAGE_REGISTRY=docker.io' 'IMAGE_REPOSITORY=inloco/mactions' -C oci latest
-          make 'IMAGE_REGISTRY=quay.io' 'IMAGE_REPOSITORY=inloco/mactions' -C oci latest
-          make 'IMAGE_REGISTRY=ghcr.io' 'IMAGE_REPOSITORY=${{ github.repository }}' -C oci latest
           make 'IMAGE_REGISTRY=public.ecr.aws' 'IMAGE_REPOSITORY=incognia/mactions' -C oci latest
diff --git a/pkr/runner.pkr.hcl b/pkr/runner.pkr.hcl
@@ -33,8 +33,14 @@ build {
       "HOMEBREW_INSTALL_FROM_API=1 /private/tmp/brew.sh",
       "rm -Rfv /private/tmp/brew.sh",
 
-      "HOMEBREW_INSTALL_FROM_API=1 brew install --formula jq mas skopeo xcinfo",
-      "HOMEBREW_INSTALL_FROM_API=1 brew install --cask intel-haxm",
+      "HOMEBREW_INSTALL_FROM_API=1 brew install --formula jq mas skopeo xcinfo gh gnu-sed",
+
+      # don't install through brew because of installation errors
+      # "brew install --cask intel-haxm",
+      "curl -sSLfo haxm.zip https://github.com/intel/haxm/releases/download/v7.8.0/haxm-macosx_v7_8_0.zip",
+      "unzip haxm.zip -d haxm",
+      "sudo bash haxm/silent_install.sh",
+      "rm -r haxm haxm.zip",
 
       # "mas install 497799835",
       # "xcinfo install ${var.xcode-version}",