Skip to content

Commit f3e810c

Browse files
ddd-mtlddd-mtl
authored
Merge pull request #43 from lightningrodlabs/damien_ludotheque
ludotheque, version mismatch prompt and 127 support
2 parents 175e640 + 5634b3a commit f3e810c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+5212
-10991
lines changed

‎.github/workflows/build-dna.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: build-dna
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
build-dna:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
# install hc tool
12+
- name: Install hc tool and wasm target
13+
shell: bash # important because this runs shell scripts
14+
run: |
15+
npm run ci:hc-install
16+
# build dna
17+
- name: Build DNA
18+
run: |
19+
npm run build:happ
20+
# Hash Zome
21+
- name: Hash Zome Install
22+
run: |
23+
npm run hash-zome-install
24+
- name: Hash Zome Install
25+
run: |
26+
npm run hash-zome
27+
# "upload" dna build artifacts
28+
- uses: actions/upload-artifact@master
29+
with:
30+
name: where-dna-artifact
31+
path: dna/workdir/dna-where/where.dna
32+
- uses: actions/upload-artifact@master
33+
with:
34+
name: where-happ-artifact
35+
path: dna/workdir/happ-where/where.happ
36+
- uses: actions/upload-artifact@master
37+
with:
38+
name: where-hash-artifact
39+
path: dna/where_zome_hash.txt
40+
# Setup npm
41+
- name: Install nodejs dependencies
42+
run: |
43+
npm install where --ignore-scripts
44+
# Build happ
45+
- name: Build happ
46+
run: |
47+
npm run build:ui
48+
# Build web-happ
49+
- name: Build web-happ
50+
run: |
51+
npm run build:webapp
52+
# "upload" web-happ as build artifact
53+
- uses: actions/upload-artifact@master
54+
with:
55+
name: where-webapp-artifact
56+
path: workdir/where.webhapp

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- v[0-9]+.*
77

88
env:
9-
WHERE_VERSION: 0.0.8
9+
WHERE_VERSION: 0.0.9
1010
USE_HARD_LINKS: false
1111

1212
jobs:
@@ -20,50 +20,13 @@ jobs:
2020
# (required)
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222

23-
build-dna:
24-
runs-on: ubuntu-latest
25-
steps:
26-
- uses: actions/checkout@v2
27-
# install hc tool
28-
- name: Install hc tool and wasm target
29-
shell: bash # important because this runs shell scripts
30-
run: |
31-
npm run ci:hc-install
32-
# build dna
33-
- name: Build DNA
34-
run: |
35-
npm run build:happ
36-
# "upload" dna as build artifact
37-
- uses: actions/upload-artifact@master
38-
with:
39-
name: where-dna-artifact
40-
path: dna/workdir/dna/where.dna
41-
# "upload" happ as build artifact
42-
- uses: actions/upload-artifact@master
43-
with:
44-
name: where-happ-artifact
45-
path: dna/workdir/happ/where.happ
46-
# Setup npm
47-
- name: Install nodejs dependencies
48-
run: |
49-
npm install where --ignore-scripts
50-
# Build happ
51-
- name: Build happ
52-
run: |
53-
npm run build:ui
54-
# Build web-happ
55-
- name: Build web-happ
56-
run: |
57-
npm run build:webapp
58-
# "upload" web-happ as build artifact
59-
- uses: actions/upload-artifact@master
60-
with:
61-
name: where-webapp-artifact
62-
path: workdir/where.webhapp
23+
# Build the dna & happ
24+
call-build-dna:
25+
uses: ./.github/workflows/build-dna.yml
6326

6427
# upload the app package for each target os
6528
build-binaries:
66-
needs: build-dna
29+
needs: call-build-dna
6730
strategy:
6831
#fail-fast: false
6932
matrix:
@@ -79,21 +42,25 @@ jobs:
7942
- name: clearing precompiled dna files
8043
continue-on-error: true
8144
run: |
82-
rm dna/workdir/dna/where.dna
83-
rm dna/workdir/happ/where.happ
45+
rm dna/workdir/dna-where/where.dna
46+
rm dna/workdir/happ-where/where.happ
8447
# Download previously uploaded artifacts
8548
- uses: actions/download-artifact@master
8649
with:
8750
name: where-dna-artifact
88-
path: dna/workdir/dna
51+
path: dna/workdir/dna-where
8952
- uses: actions/download-artifact@master
9053
with:
9154
name: where-happ-artifact
92-
path: dna/workdir/happ
55+
path: dna/workdir/happ-where
9356
- uses: actions/download-artifact@master
9457
with:
9558
name: where-webapp-artifact
9659
path: workdir
60+
- uses: actions/download-artifact@master
61+
with:
62+
name: where-hash-artifact
63+
path: workdir
9764
# Check if exist
9865
- name: list webhapp
9966
continue-on-error: true
@@ -140,7 +107,7 @@ jobs:
140107
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
141108
run: |
142109
gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Where-$WHERE_VERSION.AppImage" --clobber
143-
gh release upload "${GITHUB_REF#refs/tags/}" "dna/workdir/happ/where.happ" --clobber
110+
gh release upload "${GITHUB_REF#refs/tags/}" "dna/workdir/happ-where/where.happ" --clobber
144111
gh release upload "${GITHUB_REF#refs/tags/}" "workdir/where.webhapp" --clobber
145112
- name: upload binary (macos only)
146113
if: ${{ runner.os == 'macOs' }}

‎.github/workflows/test.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@ name: test-workflow x64
33
on: workflow_dispatch
44

55
env:
6-
WHERE_VERSION: 0.0.8
6+
WHERE_VERSION: 0.0.9
77
USE_HARD_LINKS: false
88

99
jobs:
10+
# Build the dna & happ
11+
call-build-dna:
12+
uses: ./.github/workflows/build-dna.yml
13+
1014
# upload the app package for each target os
1115
build-binaries:
16+
needs: call-build-dna
1217
strategy:
1318
fail-fast: false
1419
matrix:
@@ -25,7 +30,7 @@ jobs:
2530
continue-on-error: true
2631
run: |
2732
tsc --version
28-
working-directory: dna/workdir/happ
33+
working-directory: dna/workdir/happ-where
2934
# Setup npm
3035
- name: Install nodejs dependencies
3136
run: |
@@ -50,7 +55,7 @@ jobs:
5055
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5156
# run: |
5257
# npm run dist-linux
53-
# gh release upload "v0.0.8-rc6" "electron/out/where-$WHERE_VERSION.tar.gz" --clobber
58+
# gh release upload "manual-release" "electron/out/where-$WHERE_VERSION.tar.gz" --clobber
5459
# upload installers and binaries
5560
- name: list builds
5661
continue-on-error: true
@@ -69,16 +74,16 @@ jobs:
6974
env:
7075
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7176
run: |
72-
gh release upload "v0.0.8-rc6" "electron/out/Where-$WHERE_VERSION.AppImage" --clobber
77+
gh release upload "manual-release" "electron/out/Where-$WHERE_VERSION.AppImage" --clobber
7378
- name: upload binary (macos only)
7479
if: ${{ runner.os == 'macOs' }}
7580
env:
7681
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7782
run: |
78-
gh release upload "v0.0.8-rc6" "electron/out/Where-$WHERE_VERSION.dmg" --clobber
83+
gh release upload "manual-release" "electron/out/Where-$WHERE_VERSION.dmg" --clobber
7984
- name: upload binary (Windows only)
8085
if: ${{ runner.os == 'Windows' }}
8186
env:
8287
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8388
run: |
84-
gh release upload "v0.0.8-rc6" "electron/out/Where.Setup.$env:WHERE_VERSION.exe" --clobber
89+
gh release upload "manual-release" "electron/out/Where.Setup.$env:WHERE_VERSION.exe" --clobber

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ node_modules/
1010
dist/
1111
.cargo/
1212
.hc*
13-
dna/workdir/dna/*.dna
14-
dna/workdir/happ/*.happ
13+
dna/workdir/dna*/*.dna
14+
dna/workdir/happ*/*.happ
1515
workdir/*.webhapp
1616
*.tsbuildinfo
17-
.running
17+
.running

0 commit comments

Comments
 (0)