From 1d54b07091b476dbaa3ff99dba0b6b0275b0404c Mon Sep 17 00:00:00 2001 From: Jens van de Wiel Date: Wed, 8 Nov 2023 12:33:04 +0100 Subject: [PATCH 1/4] ignore keyfile --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 464c0fd..682b17d 100644 --- a/.gitignore +++ b/.gitignore @@ -190,4 +190,5 @@ fabric.properties !installer/steamcmd.exe !build/windows/installer/VC_redist.x64.exe !build/windows/installer/VC_redist.x86.exe -steamcmd \ No newline at end of file +steamcmd +KEY \ No newline at end of file From 9839ae9bc0e68f97ca986771a8a330cf3c46072a Mon Sep 17 00:00:00 2001 From: Jens van de Wiel Date: Wed, 8 Nov 2023 12:33:17 +0100 Subject: [PATCH 2/4] added key embedded in the app --- .github/workflows/main.yml | 2 ++ main.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d88cb9..c79dc22 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,6 +22,8 @@ jobs: - name: Set direct proxy run: go env -w GOPROXY=direct - run: go install github.com/wailsapp/wails/cmd/wails@latest + - name: Create api KEY file + - run: echo "${{ secrets.API_TOKEN }}" > KEY - name: Update wails.json run: node build/updateConfig.js ${{ github.ref_name }} false - uses: dAppServer/wails-build-action@v2.2 diff --git a/main.go b/main.go index 6ea724f..9c23273 100644 --- a/main.go +++ b/main.go @@ -22,6 +22,9 @@ var assets embed.FS //go:embed wails.json var WailsConfigFile []byte +//go:embed KEY +var KEY string + const ( logFilePath = "main.log" ) From edb0b5dddfb015d868f9679092d4dd9644349936 Mon Sep 17 00:00:00 2001 From: Jens van de Wiel Date: Wed, 8 Nov 2023 12:36:47 +0100 Subject: [PATCH 3/4] fixed wrokflow --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c79dc22..9bfd85a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,9 +23,9 @@ jobs: run: go env -w GOPROXY=direct - run: go install github.com/wailsapp/wails/cmd/wails@latest - name: Create api KEY file - - run: echo "${{ secrets.API_TOKEN }}" > KEY + run: echo "${{ secrets.API_TOKEN }}" > KEY - name: Update wails.json - run: node build/updateConfig.js ${{ github.ref_name }} false + run: node build/updateConfig.js ${{ github.ref_name }} false - uses: dAppServer/wails-build-action@v2.2 with: build-name: ${{ matrix.build.name }} From 197e2dfaaac1c1d157f8693aaeef940be3c7fd6e Mon Sep 17 00:00:00 2001 From: Jens van de Wiel Date: Wed, 8 Nov 2023 12:37:46 +0100 Subject: [PATCH 4/4] add step to nightly --- .github/workflows/nightly.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index fa24e95..5cf5642 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -25,6 +25,8 @@ jobs: - name: Get current date id: date run: echo "::set-output name=date::$(date +'%Y.%m.%d')" + - name: Create api KEY file + run: echo "${{ secrets.API_TOKEN }}" > KEY - name: Update wails.json run: node build/updateConfig.js ${{ steps.date.outputs.date }}.${{ github.run_number }} true - uses: dAppServer/wails-build-action@v2.2