Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/discord tray icon incompatibility #741

Merged
merged 10 commits into from
Dec 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixes false positive virus detection problems with Windows build
  • Loading branch information
digimezzo committed Dec 14, 2024
commit ebedcabaebc839c2daa18e362f02663a669a7c81
51 changes: 30 additions & 21 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,24 +86,33 @@ jobs:
runs-on: windows-2019
if: github.event.pull_request.merged == true
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@master
with:
node-version: '20.x'
- name: install dependencies
run: npm install
- name: run unit tests
run: npm run test
- name: build
run: npm run electron:windows
- name: fetch current version
id: ver_name
uses: notiz-dev/github-action-json-property@release
with:
path: 'package.json'
prop_path: 'version'
- name: upload build artifacts
uses: actions/upload-artifact@v4
with:
name: dopamine-merge-win
path: release\Dopamine-*.exe
- uses: actions/checkout@v2
- uses: actions/setup-node@master
with:
node-version: '20.x'
- name: Install dependencies
run: npm install
- name: Run unit tests
run: npm run test
- name: Build
run: npm run electron:windows
- name: Fetch current version
id: ver_name
uses: notiz-dev/github-action-json-property@release
with:
path: 'package.json'
prop_path: 'version'
- name: Download and Install 7-Zip
run: |
curl -L -o 7z.exe https://www.7-zip.org/a/7z2201-x64.exe
Start-Process -FilePath 7z.exe -ArgumentList '/S' -Wait
- name: Create 7z Archive With Only EXE Files
shell: cmd
run: |
cd release
"C:\Program Files\7-Zip\7z.exe" a ../dopamine-nightly-win.7z Dopamine-*.exe
- name: Upload Build Artifact
uses: actions/upload-artifact@v4
with:
name: dopamine-nightly-win
path: dopamine-nightly-win.7z
55 changes: 32 additions & 23 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,26 +82,35 @@ jobs:
path: release/Dopamine-*.dmg

nightly_build_on_win:
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@master
with:
node-version: '20.x'
- name: install dependencies
run: npm install
- name: run unit tests
run: npm run test
- name: build
run: npm run electron:windows
- name: fetch current version
id: ver_name
uses: notiz-dev/github-action-json-property@release
with:
path: 'package.json'
prop_path: 'version'
- name: upload build artifacts
uses: actions/upload-artifact@v4
with:
name: dopamine-nightly-win
path: release\Dopamine-*.exe
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@master
with:
node-version: '20.x'
- name: Install dependencies
run: npm install
- name: Run unit tests
run: npm run test
- name: Build
run: npm run electron:windows
- name: Fetch current version
id: ver_name
uses: notiz-dev/github-action-json-property@release
with:
path: 'package.json'
prop_path: 'version'
- name: Download and Install 7-Zip
run: |
curl -L -o 7z.exe https://www.7-zip.org/a/7z2201-x64.exe
Start-Process -FilePath 7z.exe -ArgumentList '/S' -Wait
- name: Create 7z Archive With Only EXE Files
shell: cmd
run: |
cd release
"C:\Program Files\7-Zip\7z.exe" a ../dopamine-nightly-win.7z Dopamine-*.exe
- name: Upload Build Artifact
uses: actions/upload-artifact@v4
with:
name: dopamine-nightly-win
path: dopamine-nightly-win.7z