Skip to content

Commit 87f88cf

Browse files
committed
ci, cleanup
1 parent 33d2687 commit 87f88cf

File tree

5 files changed

+43
-22
lines changed

5 files changed

+43
-22
lines changed

.github/CHANGELOG.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1-
# Octos initial release
1+
# Octos: HTML dynamic desktop engine
22

3-
# Download OctosSetup.exe below. :rocket:
3+
[Website](https://underpig1.github.io/octos/) | [GitHub](https://github.com/underpig1/octos)
4+
5+
Feautures:
6+
- Multi-monitor support
7+
- Wallpaper mouse interactivity
8+
- Download community creations from the app
9+
- Free and open source
10+
- Performant and lightweight package
11+
12+
Minimum requirements:
13+
- OS: Windows 10 or later
14+
- Graphics: DirectX 11 compatible
15+
- Storage: 10 MB free disk space
16+
- RAM: at least 4 GB recommended
17+
- Architecture: both 32-bit and 64-bit supported
18+
- CPU: Intel/AMD dual-core processor
19+
- Microsoft WebView2 Runtime
20+
21+
## Download OctosSetup.exe below. :rocket:

.github/workflows/release.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,27 @@ on:
33
push:
44
tags:
55
- "v*.*.*"
6+
workflow_dispatch:
67
jobs:
78
create-release:
89
runs-on: windows-latest
10+
defaults:
11+
run:
12+
shell: pwsh
913
steps:
14+
- name: Extract version from tag
15+
id: vars
16+
run: echo "VERSION=$($env:GITHUB_REF -replace 'refs/tags/v','')" >> $env:GITHUB_ENV
17+
1018
- uses: actions/checkout@v3
1119
- name: Setup Node.js
1220
uses: actions/setup-node@v4
1321
with:
1422
node-version: 20
1523
- name: Install npm dependencies
1624
run: npm install
17-
- name: Update package.json version
18-
id: vars
19-
shell: pwsh
20-
run: |
21-
$tag = '${{ github.ref_name }}'
22-
$version = $tag.TrimStart('v')
23-
Write-Host "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8
25+
- name: Update package version
26+
run: npm version $env:VERSION --no-git-tag-version
2427
- name: Build API
2528
run: npm run build-api
2629
- name: Publish as npm package
@@ -37,16 +40,14 @@ jobs:
3740
working-directory: .
3841
env:
3942
VCPKG_ROOT: C:\vcpkg
40-
- name: Build installer MSIX
41-
run: msbuild Octos.vcxproj /t:BundleAppx /p:AppVersion="$($env:VERSION).0"
42-
shell: pwsh
43+
# - name: Build installer MSIX
44+
# run: msbuild Octos.vcxproj /t:BundleAppx /p:AppVersion=$env:VERSION.0
4345
- name: Build installer EXE
44-
run: msbuild Octos.vcxproj /t:InnoSetup /p:AppVersion="$($env:VERSION).0"
45-
shell: pwsh
46+
run: msbuild Octos.vcxproj /t:InnoSetup /p:AppVersion=$env:VERSION.0
4647

4748
- name: Release
4849
uses: softprops/action-gh-release@v2
4950
if: github.ref_type == 'tag'
5051
with:
51-
files: octos.min.js build/OctosSetup.msixbundle build/OctosSetup.exe build/appx/* LICENSE
52-
body_path: ./github/CHANGELOG.md
52+
files: octos.min.js build/OctosSetup.exe LICENSE #build/OctosSetup.msixbundle #build/appx/*
53+
body_path: ./.github/CHANGELOG.md

Octos.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
Properties="Platform=x64;Configuration=Release" />
188188
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Build"
189189
Properties="Platform=x86;Configuration=Release" />
190+
<Exec Command="powershell -Command &quot;Start-Sleep -Seconds 2&quot;" />
190191
<Exec Command="iscc.exe /dAppVersion=$(AppVersion) $(ProjectDir)OctosSetup.iss" />
191192
<Message Text="Setup EXE created at $(ProjectDir)build\OctosSetup.exe" Importance="high" />
192193
</Target>

OctosSetup.iss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,22 @@ OutputBaseFilename=OctosSetup
66
Compression=lzma
77
SolidCompression=yes
88
UninstallDisplayIcon={app}\Octos.exe
9-
ArchitecturesAllowed=x86 x64
10-
ArchitecturesInstallIn64BitMode=x64
9+
ArchitecturesAllowed=x86 x64compatible
10+
ArchitecturesInstallIn64BitMode=x64compatible
1111
DefaultDirName={commonpf}\Octos
1212
ChangesEnvironment=true
1313
DisableWelcomePage=no
1414
WizardImageFile=./img/wizard-screen.bmp
1515
WizardSmallImageFile=./img/small-wizard.bmp
1616
DisableDirPage=false
1717
OutputDir=build
18+
DisableProgramGroupPage=yes
1819
; LicenseFile=LICENSE
1920

2021
[Files]
2122
; Source: "build\Release\Octos.exe"; DestDir: "{app}"; Flags: ignoreversion
22-
Source: ".\build\x64\Release\*"; DestDir: "{app}"; Excludes: ".\build\Release\img\*.png"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
23-
Source: ".\build\Win32\Release\*"; DestDir: "{app}"; Excludes: ".\build\Release\img\*.png"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: not Is64BitInstallMode
23+
Source: ".\build\x64\Release\*"; DestDir: "{app}"; Excludes: ".\build\x64\Release\img\*.png"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
24+
Source: ".\build\Win32\Release\*"; DestDir: "{app}"; Excludes: ".\build\Win32\Release\img\*.png"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: not Is64BitInstallMode
2425
; Source: ".\vcpkg_installed\x64-windows\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
2526

2627
[Icons]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[![Buy Me A Coffee](https://img.shields.io/badge/Buy%20Me%20a%20Coffee-ffdd00?style=for-the-badge&logo=buy-me-a-coffee&logoColor=black)](https://buymeacoffee.com/underpig)
1010

1111
### HTML-powered dynamic desktop engine
12-
Create animated and interactive wallpapers with HTML/CSS/JS for Windows 10 & 11
12+
Create live, interactive wallpapers with HTML/CSS/JS for Windows 10 & 11
1313

1414
**[Website](https://underpig1.github.io/octos) | [Docs](https://underpig1.github.io/octos/guides) | [Download]()**
1515

@@ -35,7 +35,7 @@ Easily personalize your desktop with this interactive interface. -->
3535
## [Octos API](https://underpig1.github.io/octos/guides/api/)
3636
Elevate your wallpaper with the Octos API. Access music visualization data, synchronize across monitors and displays, add media controls, and so much more right on your desktop in JavaScript via the Octos API.
3737

38-
## [Octos Docs](https://underpig1.github.io/octos/)
38+
## [Octos Docs](https://underpig1.github.io/octos/guides/)
3939
It's super easy to get started making your own content for Octos. Check out the docs for a quick getting started guide.
4040

4141
## [Octos Community](https://github.com/underpig1/octos-community/tree/master)

0 commit comments

Comments
 (0)