New installer

.github/workflows/tauri.yml

@@ -34,3 +34,22 @@ jobs:
 
     - name: Build tauri project
       run: earthly --ci --remote-cache=ghcr.io/safing/build-cache --push +tauri-ci
+
+  lint:
+    name: Linter
+    runs-on: ubuntu-latest
+    steps:
+    - uses: earthly/actions-setup@v1
+      with:
+        version: v0.8.0
+    - uses: actions/checkout@v4
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build tauri project
+      run: earthly --ci --remote-cache=ghcr.io/safing/build-cache --push +tauri-lint

Earthfile

@@ -462,17 +462,14 @@ tauri-build:
     # Our tauri app has externalBins configured so tauri will try to embed them when it finished compiling
     # the app. Make sure we copy portmaster-start and portmaster-core in all architectures supported.
     # See documentation for externalBins for more information on how tauri searches for the binaries.
-    COPY (+go-build/output --CMDS="portmaster-start portmaster-core" --GOOS="${GOOS}" --GOARCH="${GOARCH}" --GOARM="${GOARM}") /tmp/gobuild
+    COPY (+go-build/output --CMDS="portmaster-core" --GOOS="${GOOS}" --GOARCH="${GOARCH}" --GOARM="${GOARM}") /tmp/gobuild
 
     # Place them in the correct folder with the rust target tripple attached.
     FOR bin IN $(ls /tmp/gobuild)
         # ${bin$.*} does not work in SET commands unfortunately so we use a shell
         # snippet here:
         RUN set -e ; \
-            dest="./binaries/${bin}-${target}" ; \
-            if [ -z "${bin##*.exe}" ]; then \
-                dest="./binaries/${bin%.*}-${target}.exe" ; \
-            fi ; \
+            dest="./binaries/${bin}" ; \
             cp "/tmp/gobuild/${bin}" "${dest}" ;
     END
 
@@ -506,8 +503,8 @@ tauri-build:
     RUN echo output: $(ls -R "target/${target}/release")
 
     # Binaries
-    SAVE ARTIFACT --if-exists --keep-ts "target/${target}/release/app" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/portmaster-app"
-    SAVE ARTIFACT --if-exists --keep-ts "target/${target}/release/app.exe" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/portmaster-app.exe"
+    SAVE ARTIFACT --if-exists --keep-ts "target/${target}/release/portmaster" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/portmaster-app"
+    SAVE ARTIFACT --if-exists --keep-ts "target/${target}/release/portmaster.exe" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/portmaster-app.exe"
     SAVE ARTIFACT --if-exists --keep-ts "target/${target}/release/WebView2Loader.dll" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/WebView2Loader.dll"
 
     # Installers
@@ -575,7 +572,7 @@ tauri-build-windows-bundle:
     RUN echo "Version Suffix: $VERSION_SUFFIX"
 
     RUN echo output: $(ls -R "target/${target}/release")
-    RUN mv "target/${target}/release/app.exe" "target/${target}/release/portmaster-app_${VERSION_SUFFIX}.exe"
+    RUN mv "target/${target}/release/portmaster.exe" "target/${target}/release/portmaster-app_${VERSION_SUFFIX}.exe"
     RUN zip "target/${target}/release/portmaster-app_${VERSION_SUFFIX}.zip" "target/${target}/release/portmaster-app_${VERSION_SUFFIX}.exe" -j portmaster-app${VERSION_SUFFIX}.exe "target/${target}/release/WebView2Loader.dll" -j WebView2Loader.dll
     SAVE ARTIFACT --if-exists "target/${target}/release/portmaster-app_${VERSION_SUFFIX}.zip" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/"
 
@@ -636,6 +633,42 @@ tauri-release:
         BUILD +tauri-build --target="${arch}"
     END
 
+tauri-lint:
+    FROM +tauri-src
+
+    # Clippy (rust linter) will try to build the project before it runs the linter.
+    # Make sure we have evrything needed to build the project.    
+    ARG target="x86_64-unknown-linux-gnu"
+
+    # if we want tauri to create the installer bundles we also need to provide all external binaries
+    # we need to do some magic here because tauri expects the binaries to include the rust target tripple.
+    # We already know that triple because it's a required argument. From that triple, we use +RUST_TO_GO_ARCH_STRING
+    # function from below to parse the triple and guess wich GOOS and GOARCH we need.
+    RUN mkdir /tmp/gobuild
+    RUN mkdir ./binaries
+
+    DO +RUST_TO_GO_ARCH_STRING --rustTarget="${target}"
+    RUN echo "GOOS=${GOOS} GOARCH=${GOARCH} GOARM=${GOARM} GO_ARCH_STRING=${GO_ARCH_STRING}"
+
+    # Our tauri app has externalBins configured so tauri will try to embed them when it finished compiling
+    # the app. Make sure we copy portmaster-start and portmaster-core in all architectures supported.
+    # See documentation for externalBins for more information on how tauri searches for the binaries.
+    COPY (+go-build/output --CMDS="portmaster-start portmaster-core" --GOOS="${GOOS}" --GOARCH="${GOARCH}" --GOARM="${GOARM}") /tmp/gobuild
+
+    # Place them in the correct folder with the rust target tripple attached.
+    FOR bin IN $(ls /tmp/gobuild)
+        # ${bin$.*} does not work in SET commands unfortunately so we use a shell
+        # snippet here:
+        RUN set -e ; \
+            dest="./binaries/${bin}-${target}" ; \
+            if [ -z "${bin##*.exe}" ]; then \
+                dest="./binaries/${bin%.*}-${target}.exe" ; \
+            fi ; \
+            cp "/tmp/gobuild/${bin}" "${dest}" ;
+    END
+    DO rust+SET_CACHE_MOUNTS_ENV
+    RUN cargo clippy --all-targets --all-features -- -D warnings
+
 kext-build:
     FROM ${rust_builder_image}
 

base/updater/export.go

@@ -1,15 +1,15 @@
 package updater
 
-// Export exports the list of resources.
-func (reg *ResourceRegistry) Export() map[string]*Resource {
-	reg.RLock()
-	defer reg.RUnlock()
+// // Export exports the list of resources.
+// func (reg *ResourceRegistry) Export() map[string]*Resource {
+// 	reg.RLock()
+// 	defer reg.RUnlock()
 
-	// copy the map
-	copiedResources := make(map[string]*Resource)
-	for key, val := range reg.resources {
-		copiedResources[key] = val.Export()
-	}
+// 	// copy the map
+// 	copiedResources := make(map[string]*Resource)
+// 	for key, val := range reg.resources {
+// 		copiedResources[key] = val.Export()
+// 	}
 
-	return copiedResources
-}
+// 	return copiedResources
+// }