diff options
author | Mohamed Mohamedin <ashraf.teleb85@gmail.com> | 2021-10-18 15:23:49 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-18 15:23:49 +0300 |
commit | 79ee3788e6e36835fba15e3b6b3e8f50b6893b70 (patch) | |
tree | bbcec0bfca66acb2dd24ddb4785d316335f49746 | |
parent | a5668b3400516d5bf9d0d0d0dfbcc2ff536f6c99 (diff) | |
parent | 334a3e0f5479283d7bcb4892ddebd0e6931ae166 (diff) |
Merge branch 'dev' into dev
-rw-r--r-- | .github/workflows/electron-builder-win32.yml | 38 | ||||
-rw-r--r-- | .github/workflows/electron-builder.yml | 4 | ||||
-rw-r--r-- | package.json | 4 | ||||
-rw-r--r-- | test | 0 |
4 files changed, 43 insertions, 3 deletions
diff --git a/.github/workflows/electron-builder-win32.yml b/.github/workflows/electron-builder-win32.yml new file mode 100644 index 0000000..7aab826 --- /dev/null +++ b/.github/workflows/electron-builder-win32.yml @@ -0,0 +1,38 @@ +name: Electron Builder CI (WIN) + +on: + push: + branches: + - release + tags: + - 'v*' + +jobs: + build: + runs-on: windows-latest + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Checkout reposistory + uses: actions/checkout@v2 + - name: Installing Node + uses: actions/setup-node@v2 + with: + node-version: 14 + - name: Prepare for Windows Build + shell: powershell #The default shell for Windows + run: | + git config --global core.autocrlf input + (gc .\.gitmodules) -replace 'git@github.com:','https://github.com/' | Out-File -encoding ASCII .gitmodules + git submodule update --init --recursive + npm install -g yarn + yarn install + cd drawio/src/main/webapp + yarn install + cd ../.. + - name: Build for Windows (x32) + shell: powershell #The default shell for Windows + run: | + #Disable auto-update and build 32bit first such that latest.yml is for 64bit only + yarn run sync disableUpdate + yarn run release-win32 diff --git a/.github/workflows/electron-builder.yml b/.github/workflows/electron-builder.yml index 650d0c5..016cad2 100644 --- a/.github/workflows/electron-builder.yml +++ b/.github/workflows/electron-builder.yml @@ -2,6 +2,8 @@ name: Electron Builder CI on: push: + branches: + - dev tags: - 'v*' @@ -10,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, macos-latest] + os: [ubuntu-18.04] env: CC: clang CXX: clang++ diff --git a/package.json b/package.json index f4d2988..7057552 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "repository": { "type": "git", - "url": "git@github.com:jgraph/drawio-desktop.git" + "url": "https://github.com/ashrafteleb/drawio-desktop" }, "keywords": [ "draw.io", @@ -25,7 +25,7 @@ "author": "JGraph <support@draw.io>", "license": "Apache-2.0", "bugs": { - "url": "https://github.com/jgraph/drawio-desktop/issues" + "url": "https://github.com/ashrafteleb/drawio-desktop/issues" }, "homepage": "https://github.com/jgraph/drawio", "dependencies": { |