chore: rename the wails-test app and make it work again the integration tests (#601)

Author: dido18

README.md

@@ -237,14 +237,9 @@ Other low-level commands:
 
 ## Test update of a Wails locally
 
-NOTE: currently the mac-os is not supported since the `github.com/arduino/arduino-create-agent/updater` package has hardcoded value of the `Arduino_Create_Agent`.
-
-- `task wails:build` to build the app (by default the version=commit)
-- `task wails:up` to open the wails up (take not on the `Current Version` in the apps)
-- Open another termianl
 - `task wails:release-server:start` to start a local release server listening on port 3001 and serving the `public` folder with the releases
-- `task wails:release -- 6.0.7` to create a new release `6.0.7`
-- Open the Wails app and click on "Update" button.
+- `task wails:release:local -- 2.0.0` to create a new release `2.0.0`
+- `task wails:up:local` to open the wails app click on "Check for Updates" button to start the update from 0.0.0 to 2.0.0.
 
 ## Orchestrator configurations
 

Taskfile.wails-test.yml

@@ -0,0 +1,66 @@
+version: "3"
+
+tasks:
+  release-server:start:
+    dir: wails-test
+    cmds:
+      - docker rm -f wails-static-server
+      - docker run --rm -d -v "./public:/usr/share/nginx/html:rw" --user $(id -u):$(id -g) -p 3001:80 --name wails-static-server nginx:alpine
+
+  release:local:
+    desc: Build and put the binary into the folder served by a local NGINX server.
+    vars:
+      VERSION: "{{.CLI_ARGS}}"
+    cmds:
+      - task: build
+        vars:
+          VERSION: "{{.VERSION}}"
+      - cmd: "cd .."
+      - cmd: go run cmd/releaser/main.go -o wails-test/public/AppLab/Stable wails-test/build/bin/wails-test-{{.VERSION}}.app {{.VERSION}}
+        platforms: [darwin]
+      - cmd: go run cmd/releaser/main.go -o wails-test/public/AppLab/Stable wails-test/build/bin/wails-test-{{.VERSION}} {{.VERSION}}
+        platforms: [linux]
+      - cmd: go run cmd/releaser/main.go -o wails-test/public/AppLab/Stable wails-test/build/bin/wails-test-{{.VERSION}}.exe {{.VERSION}}
+        platforms: [windows]
+
+  up:local:
+    cmds:
+      - task: build
+        vars:
+          VERSION: "0.0.0"
+      - task: up:internal
+        vars:
+          VERSION: "0.0.0"
+          UPDATE_URL: "http://127.0.0.1:3001/"
+
+  up:staging:
+    cmds:
+      - task: build
+        vars:
+          VERSION: "{{.VERSION}}"
+      - task: up:internal
+        vars:
+          UPDATE_URL: https://downloads.oniudra.cc
+          CF_ACCESS_CLIENT_SECRET: "$(export AWS_PROFILE=arduino-staging && aws ssm get-parameter --with-decryption --name /devops/downloads/cloudflare_access_client_secret --query Parameter.Value --output text)"
+          CF_ACCESS_CLIENT_ID: "$(export AWS_PROFILE=arduino-staging && aws ssm get-parameter --with-decryption --name /devops/downloads/cloudflare_access_client_id --query Parameter.Value --output text)"
+
+  up:internal:
+    internal: true
+    dir: wails-test/build/bin
+    cmds:
+      - cmd: UPDATE_URL="{{.UPDATE_URL}}" CF_ACCESS_CLIENT_ID="{{.CF_ACCESS_CLIENT_ID}}" CF_ACCESS_CLIENT_SECRET="{{.CF_ACCESS_CLIENT_SECRET}}" ./wails-test-{{.VERSION}}
+        platforms: [linux]
+      - cmd: UPDATE_URL="{{.UPDATE_URL}}" CF_ACCESS_CLIENT_ID="{{.CF_ACCESS_CLIENT_ID}}" CF_ACCESS_CLIENT_SECRET="{{.CF_ACCESS_CLIENT_SECRET}}" ./wails-test-{{.VERSION}}.app/Contents/MacOS/wails-test-{{.VERSION}}
+        platforms: [darwin]
+      - cmd: UPDATE_URL="{{.UPDATE_URL}}" CF_ACCESS_CLIENT_ID="{{.CF_ACCESS_CLIENT_ID}}" CF_ACCESS_CLIENT_SECRET="{{.CF_ACCESS_CLIENT_SECRET}}" ./wails-test-{{.VERSION}}.exe
+        platforms: [windows]
+
+  build:
+    desc: Build the Wails app with a VERSION
+    internal: true
+    dir: wails-test
+    vars:
+      VERSION: "{{.VERSION }}"
+    cmds:
+      - "echo Building with version: {{.VERSION}}"
+      - wails build -ldflags "-X main.version={{.VERSION}}" -o wails-test-{{.VERSION}}

Taskfile.yml

@@ -2,6 +2,7 @@ version: "3"
 
 includes:
   board-emulator: ./Taskfile.board-emulator.yml
+  wails: ./Taskfile.wails-test.yml
 
 # `.env.local` takes precedence. Only new keys found in the `.env` will be
 # appended to the current set.
@@ -229,40 +230,6 @@ tasks:
           rm -rf "${TMP_PATH}"
           echo "Examples installed successfully."
 
-  wails:dev:
-    desc: Run the Wails dev locally
-    cmds:
-      - go install github.com/wailsapp/wails/v2/cmd/wails@latest
-      - cd adbfs-wails && wails dev
-
-  wails:build:
-    desc: Build the Wails app with a VERSION
-    dir: adbfs-wails
-    vars:
-      COMMIT:
-        sh: echo "$(git log --no-show-signature -n 1 --format=%h)"
-      VERSION: "{{.VERSION | default .COMMIT}}"
-    cmds:
-      - "echo Building with version: {{.VERSION}}"
-      - wails build -ldflags "-X main.version={{.VERSION}}"
-
-  wails:up:internal:
-    internal: true
-    dir: adbfs-wails/build/bin
-    cmds:
-      - cmd: UPDATE_URL="{{.UPDATE_URL}}" CF_ACCESS_CLIENT_ID="{{.CF_ACCESS_CLIENT_ID}}" CF_ACCESS_CLIENT_SECRET="{{.CF_ACCESS_CLIENT_SECRET}}" ./test-wails
-        platforms: [linux]
-      - cmd: UPDATE_URL="{{.UPDATE_URL}}" CF_ACCESS_CLIENT_ID="{{.CF_ACCESS_CLIENT_ID}}" CF_ACCESS_CLIENT_SECRET="{{.CF_ACCESS_CLIENT_SECRET}}" ./test-wails.app/Contents/MacOS/test-wails
-        platforms: [darwin]
-      - cmd: UPDATE_URL="{{.UPDATE_URL}}" CF_ACCESS_CLIENT_ID="{{.CF_ACCESS_CLIENT_ID}}" CF_ACCESS_CLIENT_SECRET="{{.CF_ACCESS_CLIENT_SECRET}}" ./test-wails.exe
-        platforms: [windows]
-
-  wails:up:
-    cmds:
-      - task: wails:up:internal
-        vars:
-          UPDATE_URL: http://127.0.0.1:3001/
-
   generate:assets:
     desc: This generates the models and bricks index.
     cmds:
@@ -286,51 +253,6 @@ tasks:
           # Bumps the default pinned latest base python image tag
           sed -i "s#runnerVersion = \".*#runnerVersion = \"${semver_tag}\"#" internal/orchestrator/config/config.go
 
-  wails:up:staging:
-    cmds:
-      - task: wails:up:internal
-        vars:
-          UPDATE_URL: https://downloads.oniudra.cc
-          CF_ACCESS_CLIENT_SECRET: "$(export AWS_PROFILE=arduino-staging && aws ssm get-parameter --with-decryption --name /devops/downloads/cloudflare_access_client_secret --query Parameter.Value --output text)"
-          CF_ACCESS_CLIENT_ID: "$(export AWS_PROFILE=arduino-staging && aws ssm get-parameter --with-decryption --name /devops/downloads/cloudflare_access_client_id --query Parameter.Value --output text)"
-
-  wails:release:
-    desc: Create a release
-    cmds:
-      - task: wails:build
-        vars:
-          VERSION: "{{.CLI_ARGS}}"
-      - cmd: "cd .."
-      - cmd: go run cmd/releaser/main.go -o adbfs-wails/public/AppLab/Stable adbfs-wails/build/bin/test-wails.app {{.CLI_ARGS}}
-        platforms: [darwin]
-      - cmd: go run cmd/releaser/main.go -o adbfs-wails/public/AppLab/Stable adbfs-wails/build/bin/test-wails {{.CLI_ARGS}}
-        platforms: [linux]
-      - cmd: go run cmd/releaser/main.go -o adbfs-wails/public/AppLab/Stable adbfs-wails/build/bin/test-wails.exe {{.CLI_ARGS}}
-        platforms: [windows]
-
-  wails:upload:staging:
-    desc: Upload AppLab/ folder and linux-amd64.json to S3 bucket arduino-downloads-staging-civet
-    cmds:
-      - export AWS_PROFILE=arduino-staging && aws s3 sync adbfs-wails/public/AppLab/Stable/{{.CLI_ARGS}}/ s3://arduino-downloads-staging-civet/AppLab/Stable/{{.CLI_ARGS}}/ --delete
-      - export AWS_PROFILE=arduino-staging && aws s3 cp adbfs-wails/public/AppLab/Stable/linux-amd64.json s3://arduino-downloads-staging-civet/AppLab/Stable/linux-amd64.json
-
-  wails:release-server:start:
-    dir: adbfs-wails
-    cmds:
-      - docker rm -f wails-static-server
-      - docker run --rm -d -v "$PWD/public:/usr/share/nginx/html:ro" -p 3001:80 --name wails-static-server nginx:alpine
-
-  wails:tag:
-    desc: Create a tag on the current commit and push it to the remote to create the release
-    cmds:
-      - |
-          if [ -z "{{.CLI_ARGS}}" ]; then
-            echo "Error: Version argument is required. Usage: task wails:tag -- <version>"
-            exit 1
-          fi
-      - git tag -a "wails-{{.CLI_ARGS}}" -m "Release {{.CLI_ARGS}}"
-      - git push origin "wails-{{.CLI_ARGS}}"
-
   build:remoteocd:
     desc: Build remoteocd and install in the arduino tools
     cmds:

adbfs-wails/frontend/.vscode/extensions.json

@@ -13,5 +13,5 @@ The [good first issue label](https://github.com/bcmi-labs/orchestrator/issues?q=
   - `cmd/arduino-app-cli`: the arduino-app-cli itself.
   - `cmd/arduino-router`: the router that makes it possible to communicate from the sketch to the python code.
   - `cmd/arduino-fs-cli`: used for interact with arduino apps file system, mostly used for debugging the `adbfs` pkg.
-- `adbfs-wails`: used to test go wails backend.
+- `wails-test`: used to test go wails backend.
 - `examples`: contains some examples of arduino apps.