Add intel tunneler for MacOS

sandialabs · Jun 17, 2024 · b22c528 · b22c528
1 parent 7583fcd
commit b22c528
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/go/Makefile b/src/go/Makefile
@@ -124,7 +124,7 @@ bin/phenix-debug: $(SOURCES) generate-bindata generate-protobuf go-generate
 	CGO_ENABLED=0 GOOS=linux go build -gcflags "all=-N -l" -trimpath -o bin/phenix-debug main.go
 
 .PHONY: phenix-tunneler
-phenix-tunneler: bin/phenix-tunneler-linux-amd64 bin/phenix-tunneler-darwin-arm64 bin/phenix-tunneler-windows-amd64.exe
+phenix-tunneler: bin/phenix-tunneler-linux-amd64 bin/phenix-tunneler-darwin-arm64 bin/phenix-tunneler-darwin-amd64 bin/phenix-tunneler-windows-amd64.exe
 
 bin/phenix-tunneler-linux-amd64: $(TUNNELSOURCES)
 	mkdir -p bin
@@ -134,6 +134,10 @@ bin/phenix-tunneler-darwin-arm64: $(TUNNELSOURCES)
 	mkdir -p bin
 	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -a -ldflags="-X 'phenix/version.Commit=$(COMMIT)' -s -w" -trimpath -o bin/phenix-tunneler-darwin-arm64 $(TUNNELSOURCES)
 
+bin/phenix-tunneler-darwin-amd64: $(TUNNELSOURCES)
+	mkdir -p bin
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -a -ldflags="-X 'phenix/version.Commit=$(COMMIT)' -s -w" -trimpath -o bin/phenix-tunneler-darwin-amd64 $(TUNNELSOURCES)
+
 bin/phenix-tunneler-windows-amd64.exe: $(TUNNELSOURCES)
 	mkdir -p bin
 	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -a -ldflags="-X 'phenix/version.Commit=$(COMMIT)' -s -w" -trimpath -o bin/phenix-tunneler-windows-amd64.exe $(TUNNELSOURCES)
diff --git a/src/js/src/components/Tunneler.vue b/src/js/src/components/Tunneler.vue
@@ -70,7 +70,8 @@
       return {
         data: [
           {'name': 'Linux',   'arch': 'amd64', 'link': this.$router.resolve({ name: 'linux-tunneler'}).href},
-          {'name': 'MacOS',   'arch': 'arm64', 'link': this.$router.resolve({ name: 'macos-tunneler'}).href},
+          {'name': 'MacOS',   'arch': 'arm64', 'link': this.$router.resolve({ name: 'macos-arm-tunneler'}).href},
+          {'name': 'MacOS',   'arch': 'amd64', 'link': this.$router.resolve({ name: 'macos-intel-tunneler'}).href},
           {'name': 'Windows', 'arch': 'amd64', 'link': this.$router.resolve({ name: 'windows-tunneler'}).href}
         ]
       }

diff --git a/src/js/src/router.js b/src/js/src/router.js
@@ -64,7 +64,8 @@ const router = new Router({
     {path: '/api/v1/experiments/:id/vms/:name/vnc?token=:token',            name: 'vnc'},
 
     {path: '/downloads/tunneler/phenix-tunneler-linux-amd64',       name: 'linux-tunneler'},
-    {path: '/downloads/tunneler/phenix-tunneler-darwin-arm64',      name: 'macos-tunneler'},
+    {path: '/downloads/tunneler/phenix-tunneler-darwin-arm64',      name: 'macos-arm-tunneler'},
+    {path: '/downloads/tunneler/phenix-tunneler-darwin-amd64',      name: 'macos-intel-tunneler'},
     {path: '/downloads/tunneler/phenix-tunneler-windows-amd64.exe', name: 'windows-tunneler'},
 
     {path: '/proxysignup', name: 'proxysignup', component: ProxySignUp, props: true},