Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
24 changes: 12 additions & 12 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
# - name: Install libunwind
# run: sudo apt-get install libunwind-dev wget2

- uses: actions/checkout@v4
- uses: actions/checkout@v7

- name: ccache
uses: hendrikmuhs/ccache-action@v1.2.14
uses: hendrikmuhs/ccache-action@v1.2.24
with:
key: ${{ matrix.cfg.target }}

Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:

- name: Update Release Linux
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand All @@ -122,7 +122,7 @@ jobs:

- name: Update Release Linux gui
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand All @@ -142,10 +142,10 @@ jobs:
build-linux-ubuntu22:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7

- name: ccache
uses: hendrikmuhs/ccache-action@v1.2.14
uses: hendrikmuhs/ccache-action@v1.2.24
with:
key: ubuntu22-linux

Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:

- name: Update Release Linux ubuntu22
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand All @@ -206,7 +206,7 @@ jobs:

- name: Update Release Linux gui ubuntu22
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand All @@ -220,10 +220,10 @@ jobs:
build-linux-arm64:
runs-on: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7

- name: ccache
uses: hendrikmuhs/ccache-action@v1.2.14
uses: hendrikmuhs/ccache-action@v1.2.24
with:
key: arm64-linux

Expand Down Expand Up @@ -275,7 +275,7 @@ jobs:

- name: Update Release Linux arm64
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand All @@ -284,7 +284,7 @@ jobs:

- name: Update Release Linux gui arm64
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ jobs:
env:
TARGET: ${{ matrix.cfg.target }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: ccache
uses: hendrikmuhs/ccache-action@v1.2.14
uses: hendrikmuhs/ccache-action@v1.2.24
with:
# key: ${{ matrix.os }}-${{ matrix.type }}
key: ${{ matrix.os }}-${{ matrix.cfg.target }}

- uses: actions/setup-node@v4
- uses: actions/setup-node@v7
with:
node-version: 24
- name: Setup
Expand Down Expand Up @@ -154,15 +154,15 @@ jobs:

- name: Update Release macOS-arm64
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
make_latest: ${{ env.RELEASE == 'latest' && 'false' || 'legacy' }}
files: projectGenerator-mac-arm64.zip
- name: Update Release macOS
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-vs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
BITS: ${{ matrix.bits }}
steps:
- name: Clone repository
uses: actions/checkout@v4
- uses: actions/setup-node@v4
uses: actions/checkout@v7
- uses: actions/setup-node@v7
with:
node-version: 22
node-version: 24
- uses: msys2/setup-msys2@v2
with:
update: true
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
run:
./scripts/vs/ci_install.sh
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
uses: microsoft/setup-msbuild@v3

- name: Build projectGenerator CMDLine with oF
working-directory: ${{env.GITHUB_WORKSPACE}}
Expand Down Expand Up @@ -103,15 +103,15 @@ jobs:

- name: Update Release CMD
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
make_latest: ${{ env.RELEASE == 'latest' && 'false' || 'legacy' }}
files: ../openFrameworks/apps/projectGenerator/commandLine/bin/projectGenerator-vs.zip
- name: Update Release GUI
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v3.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
contents: read
issues: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Compare dependency versions
shell: bash
env:
Expand Down
24 changes: 12 additions & 12 deletions frontend/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "projectGenerator",
"productName": "projectGenerator",
"version": "0.104.0",
"version": "0.105.0",
"description": "Build electron GUI openFrameworks projectGenerator",
"license": "MIT",
"main": "index.js",
Expand All @@ -25,7 +25,7 @@
"dist:linux": "electron-builder --linux --publish never",
"dist:linux64": "electron-builder --linux --x64 --publish never",
"dist:linux:arm64": "electron-builder --linux --arm64 --publish never",
"build:linux64": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --overwrite --electron-version=43.4.1 --platform=linux --arch=x64"
"build:linux64": "electron-packager . $npm_package_productName --icon=static/icon/of.icns --out=dist --ignore='dist' --ignore='readme.md' --prune --overwrite --electron-version=44.9.3 --platform=linux --arch=x64"
},
"build": {
"appId": "cc.openframeworks.projectGenerator",
Expand Down Expand Up @@ -87,12 +87,12 @@
"electron-app"
],
"dependencies": {
"@types/jquery": "^3.5.32",
"@types/jquery": "^3.5.34",
"moniker": "^0.1.2",
"n-readlines": "^1.0.1"
"n-readlines": "^3.4.1"
},
"devDependencies": {
"electron": "^43.4.1",
"electron": "^44.9.3",
"electron-builder": "^26.15.3",
"@electron/packager": "^20.3.0"
}
Expand Down
Loading
Loading