Skip to content
This repository has been archived by the owner on Oct 11, 2022. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
csett86 committed Jul 21, 2022
2 parents 9da7c6a + 54374e8 commit 8ba42d4
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 39 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
name: Linux
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
- name: Install Snapcraft
Expand All @@ -33,16 +33,16 @@ jobs:
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.snapcraft_token }}
run: snapcraft upload --release edge dist/*.snap
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3.1.0
with:
name: linux-binaries
path: dist/digitales-klassenzimmer*
build-mac:
name: macOS
runs-on: macos-11
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
- name: Prepare for mas with provisioning profile
Expand All @@ -57,16 +57,16 @@ jobs:
npm ci
npm run lint
npm run dist
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3.1.0
with:
name: mac-binaries
path: dist/mas-universal/digitales-klassenzimmer*
build-windows:
name: Windows
runs-on: windows-2019
runs-on: windows-2022
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
- name: Build it
Expand All @@ -75,7 +75,7 @@ jobs:
run: |
npm ci
npm run dist
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3.1.0
with:
name: windows-binaries
path: dist/digitales-klassenzimmer*
64 changes: 38 additions & 26 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hopp-digitales-klassenzimmer",
"version": "2022.6.1",
"version": "2022.7.1",
"description": "HOPP Foundation - Das digitale Klassenzimmer",
"main": "./build/main.js",
"productName": "Digitales Klassenzimmer",
Expand Down Expand Up @@ -160,7 +160,7 @@
"readmeFilename": "README.md",
"license": "Apache-2.0",
"dependencies": {
"@jitsi/electron-sdk": "^3.0.6",
"@jitsi/electron-sdk": "^3.0.9",
"electron-debug": "^3.2.0",
"electron-reload": "^1.5.0"
},
Expand Down Expand Up @@ -189,7 +189,7 @@
"babel-loader": "^8.2.3",
"concurrently": "5.1.0",
"css-loader": "^6.7.1",
"electron": "19.0.6",
"electron": "19.0.8",
"electron-builder": "23.1.0",
"electron-context-menu": "^2.5.0",
"electron-is-dev": "^1.2.0",
Expand Down

0 comments on commit 8ba42d4

Please sign in to comment.