Bump

freifunkMUC · Nov 24, 2021 · e29dfae · e29dfae
1 parent a0c86af
commit e29dfae
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 56 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,31 +5,16 @@ on:
   # but only for the master branch
   push:
     branches:
-<<<<<<< HEAD
-      - master
-  pull_request:
-    branches:
-      - master
-=======
       - main
     tags:
       - '*'
   pull_request:
     branches:
       - main
->>>>>>> main
 
 jobs:
   build-linux:
     name: Linux
-<<<<<<< HEAD
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: '16'
-=======
     runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
@@ -38,7 +23,6 @@ jobs:
         node-version: '12.x'
     - name: Install dependencies
       run: sudo apt-get install libx11-dev zlib1g-dev libpng-dev libxtst-dev
->>>>>>> main
     - name: Build it
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -47,22 +31,6 @@ jobs:
         npm run dist
   build-mac:
     name: macOS
-<<<<<<< HEAD
-    runs-on: macos-11
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: '16'
-    - name: Prepare for app signing and notarization
-      if: ${{ github.event_name != 'pull_request' }}
-      run: |
-        echo "CSC_LINK=${{ secrets.mac_cert }}" >> $GITHUB_ENV
-        echo "CSC_KEY_PASSWORD=${{ secrets.mac_cert_password }}" >> $GITHUB_ENV
-        echo "APPLE_ID=${{ secrets.apple_id }}" >> $GITHUB_ENV
-        echo "APPLE_ID_PASSWORD=${{ secrets.apple_id_password }}" >> $GITHUB_ENV
-        echo "TEAM_ID=${{ secrets.team_id }}" >> $GITHUB_ENV
-=======
     runs-on: macos-10.15
     steps:
     - uses: actions/checkout@v2
@@ -83,7 +51,6 @@ jobs:
         echo "CSC_KEY_PASSWORD=${{ secrets.mac_certs_password }}" >> $GITHUB_ENV
         echo "API_KEY_ID=${{ secrets.api_key_id }}" >> $GITHUB_ENV
         echo "API_KEY_ISSUER_ID=${{ secrets.api_key_issuer_id }}" >> $GITHUB_ENV
->>>>>>> main
     - name: Build it
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -96,15 +63,9 @@ jobs:
     runs-on: windows-2019
     steps:
     - uses: actions/checkout@v2
-<<<<<<< HEAD
-    - uses: actions/setup-node@v2
-      with:
-        node-version: '16'
-=======
     - uses: actions/setup-node@v1
       with:
         node-version: '12.x'
->>>>>>> main
     - name: Build it
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "jitsi-meet-electron",
-<<<<<<< HEAD
   "version": "2021.11.2",
-=======
-  "version": "2.8.12",
->>>>>>> main
   "description": "Electron application for Freifunk Meet",
   "main": "./build/main.js",
   "productName": "FreifunkMeet",
@@ -26,11 +22,7 @@
     "productName": "FreifunkMeet",
     "generateUpdatesFilesForAllChannels": true,
     "afterPack": "./linux-sandbox-fix.js",
-<<<<<<< HEAD
     "afterSign": "./notarize.js",
-=======
-    "afterSign": "electron-builder-notarize",
->>>>>>> main
     "files": [
       "build",
       "resources",
@@ -135,10 +127,7 @@
   "readmeFilename": "README.md",
   "license": "Apache-2.0",
   "dependencies": {
-<<<<<<< HEAD
     "@jitsi/electron-sdk": "^3.0.1",
-=======
->>>>>>> main
     "electron-debug": "^3.2.0",
     "electron-reload": "^1.5.0"
   },
@@ -168,14 +157,8 @@
     "babel-loader": "8.1.0",
     "concurrently": "5.1.0",
     "css-loader": "3.5.0",
-<<<<<<< HEAD
     "electron": "13.5.2",
     "electron-builder": "22.11.11",
-=======
-    "electron": "13.4.0",
-    "electron-builder": "22.10.5",
-    "electron-builder-notarize": "1.2.0",
->>>>>>> main
     "electron-context-menu": "^2.5.0",
     "electron-is-dev": "^1.2.0",
     "electron-log": "^4.3.2",