forked from CringeStudios/element-desktop
Compare commits
29 Commits
Author | SHA1 | Date | |
---|---|---|---|
3e518d38f6 | |||
c6d95a774e | |||
adfae6f51d | |||
07ea7afb9e | |||
4aabc986ef | |||
d1c2be8898 | |||
d4a78d0d4f | |||
458ca631e6 | |||
508df5a8fb | |||
ac3055f51e | |||
2a89cdf443 | |||
b272e50a67 | |||
14c0db5565 | |||
8d9343e54d | |||
695860d8cd | |||
c964c11d2b | |||
5898fd756f | |||
deda5d64db | |||
![]() |
987ce7dde4 | ||
![]() |
a013504e17 | ||
![]() |
79abfcfddc | ||
![]() |
d8f4644ffc | ||
![]() |
f1d9b0a847 | ||
![]() |
960ff865fb | ||
![]() |
bbcb7c0438 | ||
![]() |
e36b3b3ce1 | ||
![]() |
566b32041d | ||
![]() |
d57ac6f016 | ||
![]() |
76a5dcf5c8 |
23
.gitea/workflows/build_linux_docker.yml
Normal file
23
.gitea/workflows/build_linux_docker.yml
Normal file
@ -0,0 +1,23 @@
|
||||
on: [push, workflow_dispatch]
|
||||
|
||||
jobs:
|
||||
build-element:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Download Cringe Studios configuration
|
||||
run: "mkdir cringe && wget -O cringe/config.json https://chat.cringe-studios.com/config.json"
|
||||
|
||||
- name: Docker setup
|
||||
run: "docker build --platform linux/amd64 -t element-desktop-dockerbuild -f dockerbuild/Dockerfile ."
|
||||
|
||||
- name: Docker build
|
||||
run: >
|
||||
ls -la && PWD=$(pwd) scripts/in-docker.sh bash -c 'ls -la &&
|
||||
yarn add matrix-seshat &&
|
||||
yarn &&
|
||||
yarn run fetch --noverify --cfgdir cringe &&
|
||||
SQLCIPHER_BUNDLED=1 yarn run docker:build:native &&
|
||||
yarn run docker:build --linux rpm --linux deb --linux tar.xz --linux AppImage --win squirrel'
|
2
.github/workflows/build_linux.yaml
vendored
2
.github/workflows/build_linux.yaml
vendored
@ -91,7 +91,7 @@ jobs:
|
||||
|
||||
# This allows contributors to test changes to the dockerbuild image within a pull request
|
||||
- name: Build docker image
|
||||
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
|
||||
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
|
||||
if: steps.changed_files.outputs.any_modified == 'true'
|
||||
with:
|
||||
file: dockerbuild/Dockerfile
|
||||
|
10
.github/workflows/dockerbuild.yaml
vendored
10
.github/workflows/dockerbuild.yaml
vendored
@ -22,15 +22,15 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3
|
||||
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3
|
||||
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
|
||||
with:
|
||||
install: true
|
||||
|
||||
- name: Build test image
|
||||
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
|
||||
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
|
||||
with:
|
||||
file: dockerbuild/Dockerfile
|
||||
push: false
|
||||
@ -52,7 +52,7 @@ jobs:
|
||||
- name: Extract metadata for Docker
|
||||
id: meta
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5
|
||||
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
tags: |
|
||||
@ -61,7 +61,7 @@ jobs:
|
||||
|
||||
- name: Build and push Docker image
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
|
||||
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
|
||||
with:
|
||||
file: dockerbuild/Dockerfile
|
||||
push: true
|
||||
|
@ -14,6 +14,7 @@ RUN apt-get -qq update && apt-get -y -qq dist-upgrade && \
|
||||
# Used by seshat (when not SQLCIPHER_STATIC) \
|
||||
libsqlcipher-dev && \
|
||||
apt-get purge -y --auto-remove && rm -rf /var/lib/apt/lists/*
|
||||
RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y wine mono-devel rpm
|
||||
RUN ln -s /usr/bin/python3 /usr/bin/python & ln -s /usr/bin/pip3 /usr/bin/pip
|
||||
|
||||
ENV DEBUG_COLORS=true
|
||||
|
16
package.json
16
package.json
@ -57,7 +57,7 @@
|
||||
"postinstall": "electron-builder install-app-deps"
|
||||
},
|
||||
"dependencies": {
|
||||
"@sentry/electron": "^5.0.0",
|
||||
"@sentry/electron": "^6.0.0",
|
||||
"@standardnotes/electron-clear-data": "^1.0.5",
|
||||
"auto-launch": "^5.0.5",
|
||||
"counterpart": "^0.18.6",
|
||||
@ -80,16 +80,16 @@
|
||||
"@types/auto-launch": "^5.0.1",
|
||||
"@types/counterpart": "^0.18.1",
|
||||
"@types/minimist": "^1.2.1",
|
||||
"@types/node": "18.19.76",
|
||||
"@types/node": "18.19.79",
|
||||
"@types/pacote": "^11.1.1",
|
||||
"@typescript-eslint/eslint-plugin": "^8.0.0",
|
||||
"@typescript-eslint/parser": "^8.0.0",
|
||||
"app-builder-lib": "26.0.8",
|
||||
"app-builder-lib": "26.0.10",
|
||||
"chokidar": "^4.0.0",
|
||||
"detect-libc": "^2.0.0",
|
||||
"electron": "34.2.0",
|
||||
"electron-builder": "26.0.8",
|
||||
"electron-builder-squirrel-windows": "26.0.8",
|
||||
"electron": "34.3.0",
|
||||
"electron-builder": "26.0.10",
|
||||
"electron-builder-squirrel-windows": "26.0.10",
|
||||
"electron-devtools-installer": "^4.0.0",
|
||||
"eslint": "^8.26.0",
|
||||
"eslint-config-google": "^0.14.0",
|
||||
@ -110,13 +110,13 @@
|
||||
"rimraf": "^6.0.0",
|
||||
"tar": "^7.0.0",
|
||||
"tsx": "^4.19.2",
|
||||
"typescript": "5.7.3"
|
||||
"typescript": "5.8.2"
|
||||
},
|
||||
"hakDependencies": {
|
||||
"matrix-seshat": "^4.0.1"
|
||||
},
|
||||
"resolutions": {
|
||||
"@types/node": "18.19.76",
|
||||
"@types/node": "18.19.79",
|
||||
"config-file-ts": "0.2.8-rc1"
|
||||
}
|
||||
}
|
||||
|
@ -8,9 +8,12 @@ if [ $? != 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "${PWD}"
|
||||
echo $(ls "${PWD}")
|
||||
|
||||
# Taken from https://www.electron.build/multi-platform-build#docker
|
||||
# Pass through any vars prefixed with INDOCKER_, removing the prefix
|
||||
docker run --rm -ti \
|
||||
docker run --rm \
|
||||
--platform linux/amd64 \
|
||||
--env-file <(env | grep -E '^INDOCKER_' | sed -e 's/^INDOCKER_//') \
|
||||
--env ELECTRON_CACHE="/root/.cache/electron" \
|
||||
@ -21,4 +24,5 @@ docker run --rm -ti \
|
||||
-v ${PWD}/docker/.gnupg:/root/.gnupg \
|
||||
-v ~/.cache/electron:/root/.cache/electron \
|
||||
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
|
||||
--workdir "/project" \
|
||||
"$IMAGE" "$@"
|
||||
|
Loading…
x
Reference in New Issue
Block a user