Skip to content

Commit

Permalink
Merge pull request #54 from gamingdoom/neutron
Browse files Browse the repository at this point in the history
Make Datcord use neutron
  • Loading branch information
gamingdoom authored Jan 5, 2024
2 parents 1439d19 + f629b3a commit f324019
Show file tree
Hide file tree
Showing 106 changed files with 123 additions and 6,084 deletions.
62 changes: 62 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# This is a basic workflow to help you get started with Actions

name: Build

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the "master" branch
push:
branches: [ "neutron", "master", "unstable" ]
pull_request:
branches: [ "master" ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
if: "!contains(github.event.commits[0].author, 'Submodule Updater')"
# The type of runner that the job will run on
runs-on: self-hosted

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Add mask
- name: add log mask
run: echo "::add-mask::${{ secrets.USERNAME }}"

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
with:
submodules: "recursive"

- name: Build
run: |
./build.sh
- name: Upload windows installer
uses: actions/[email protected]
with:
# Artifact name
name: win64-installer
# A file, directory or wildcard pattern that describes what to upload
path: neutron/build/work/appSetup-win64.exe

- name: Upload linux tarball
uses: actions/[email protected]
with:
# Artifact name
name: datcord-linux-x86_64
# A file, directory or wildcard pattern that describes what to upload
path: neutron/build/datcord.tar.bz2

- name: Upload appimage
uses: actions/[email protected]
with:
# Artifact name
name: datcord-appimage-x86_64
# A file, directory or wildcard pattern that describes what to upload
path: neutron/build/Datcord-x86_64.AppImage

31 changes: 31 additions & 0 deletions .github/workflows/update-submodules.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Update Submodules

# Controls when the action will run.
on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

schedule:
- cron: "30 * * * *"
# pull_request:
# branches: [ "master" ]

jobs:
# This workflow contains a single job called "update"
update:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
submodules: "recursive"

- name: Update Submodules
run: |
git pull --recurse-submodules
git submodule update --remote --recursive
git config --global user.name 'Submodule Updater'
git config --global user.email '[email protected]'
git remote set-url origin https://x-access-token:${{ secrets.TOKEN }}@github.com/${{ github.repository }}
git commit -am "Update Submodules" && git push || echo "No changes to commit"
9 changes: 3 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "open-in-default-browser"]
path = open-in-default-browser
url = https://github.com/gamingdoom/open-in-default-browser
[submodule "packages/arch-datcord-bin"]
path = packages/arch-datcord-bin
url = https://aur.archlinux.org/datcord-bin.git
[submodule "neutron"]
path = neutron
url = https://github.com/gamingdoom/neutron.git
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<br />
<div align="center">
<a href="https://github.com/gamingdoom/datcord">
<img src="src/changed/browser/branding/datcord/default256.png" alt="Logo" width="80" height="80">
<img src="resources/datcord.svg" alt="Logo" width="80" height="80">
</a>

<h3 align="center">Datcord</h3>
Expand Down
6 changes: 6 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

cd neutron
python configurator.py --config-file=../resources/config.json
cd build
python build.py
43 changes: 0 additions & 43 deletions buildDatcord.sh

This file was deleted.

42 changes: 0 additions & 42 deletions buildDatcordWin.sh

This file was deleted.

131 changes: 0 additions & 131 deletions crossCompileForWindows.sh

This file was deleted.

20 changes: 0 additions & 20 deletions distribution/policies-flatpak.json

This file was deleted.

20 changes: 0 additions & 20 deletions distribution/policies-linux-appimage.json

This file was deleted.

Loading

0 comments on commit f324019

Please sign in to comment.