Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI CD Release fix #120

Closed
wants to merge 38 commits into from
Closed

CI CD Release fix #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
10b32e7
New Actions UI
haimkastner Aug 23, 2022
b39a80e
Bomb version to 1.0.22 [ci skip]
haimkastner Aug 23, 2022
12d45dc
Better color picker & Better mock-mode & API mode selection #94
haimkastner Aug 24, 2022
08f06ae
Bomb version to 1.0.23 [ci skip]
haimkastner Aug 24, 2022
b834bfd
Refresh actions and timings #95
haimkastner Aug 27, 2022
e58a7f8
Bomb version to 1.0.24 [ci skip]
haimkastner Aug 27, 2022
c577cad
Demo mode info fixes
haimkastner Aug 28, 2022
7a7f6d1
Bomb version to 1.0.25 [ci skip]
haimkastner Aug 28, 2022
a171da8
Add home mode communication
haimkastner Sep 9, 2022
813982b
Bomb version to 1.0.26 [ci skip]
haimkastner Sep 9, 2022
8e201be
Local server FQDN
haimkastner Sep 10, 2022
f1920e6
Bomb version to 1.0.27 [ci skip]
haimkastner Sep 10, 2022
853be58
Add workflow_dispatch
haimkastner Jan 13, 2023
d77669d
Bomb version to 1.0.28 [ci skip]
haimkastner Jan 13, 2023
76d641f
Few minor texts fixes
haimkastner Jan 15, 2023
a364091
Bomb version to 1.0.29 [ci skip]
haimkastner Jan 15, 2023
08eca90
Upgrade Android SDK
haimkastner Jan 15, 2023
d80c3f6
Bomb version to 1.0.30 [ci skip]
haimkastner Jan 15, 2023
7fc4e2f
Fix launch icon
haimkastner Jan 21, 2023
2412cf8
Bomb version to 1.0.31 [ci skip]"
haimkastner Jan 21, 2023
717d252
Use splash icon on boot
haimkastner Feb 26, 2023
223ff6e
Bomb version to 1.0.32 [ci skip]"
haimkastner Feb 26, 2023
f71bce9
Minion's restriction and readonly mode
haimkastner May 8, 2023
23e7723
Bomb version to 1.0.33 [ci skip]"
haimkastner May 8, 2023
645fd78
Show live timeout countdown and allow reset countdown
haimkastner May 12, 2023
f35b2f5
Bomb version to 1.0.34 [ci skip]"
haimkastner May 12, 2023
9829fde
Add Mobile Application cache layer
haimkastner May 17, 2023
4999ee2
Bomb version to 1.0.35 [ci skip]"
haimkastner May 17, 2023
7b3a134
Fix negative counter on activation time
haimkastner May 18, 2023
b7addb2
Bomb version to 1.0.36 [ci skip]"
haimkastner May 18, 2023
e656ff1
Target api 33 (#116)
haimkastner Sep 9, 2023
3aa0e65
Bomb version to 1.0.37 [ci skip]"
haimkastner Sep 9, 2023
4ea66eb
Fix light application API URL
haimkastner Sep 13, 2023
90aefb7
Bomb version to 1.0.38 [ci skip]"
haimkastner Sep 13, 2023
aab575c
Update dep. #119
haimkastner Jun 11, 2024
8b0e8e2
Bomb version to 1.0.39 [ci skip]"
haimkastner Jun 11, 2024
3266a7a
Update dep
haimkastner Jun 11, 2024
eb1e634
Bomb version to 1.0.40 [ci skip]"
haimkastner Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
mkdir android
cp platforms/android/app/build/outputs/bundle/$BUILD_TYPE/app-$BUILD_TYPE.aab android/app-$BUILD_TYPE.aab
cp platforms/android/app/build/outputs/apk/$BUILD_TYPE/app-$BUILD_TYPE.apk android/app-$BUILD_TYPE.apk
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: android
path: android
Expand All @@ -95,7 +95,7 @@ jobs:
if [[ $BRANCH == 'main' ]]; then export REACT_APP_LIGHTWEIGHT_URL=$LIGHTWEIGHT_URL_PROD ; else export REACT_APP_LIGHTWEIGHT_URL=$LIGHTWEIGHT_URL_DEV; fi
if [[ $BRANCH == 'main' ]]; then export REACT_APP_SHOW_VERSION_COMMIT='false' ; else export REACT_APP_SHOW_VERSION_COMMIT='true'; fi
yarn run build
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: www
path: www
Expand All @@ -110,7 +110,7 @@ jobs:
export BRANCH=${GITHUB_REF##*/}
if [[ $BRANCH == 'main' ]]; then export REACT_APP_SHOW_VERSION_COMMIT='false' ; else export REACT_APP_SHOW_VERSION_COMMIT='true'; fi
yarn run build
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: internal
path: internal
Expand All @@ -123,7 +123,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
- uses: actions/download-artifact@master
- uses: actions/download-artifact@v4
- name: Install node
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
- uses: actions/download-artifact@master
- uses: actions/download-artifact@v4
with:
name: android
path: android
Expand Down
4 changes: 1 addition & 3 deletions config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<widget id="casa.casanet.dashboard" version="1.0.21" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<widget id="casa.casanet.dashboard" version="1.0.40" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<name>casanet</name>
<description>
Cadasnet IoT Control Dashboard
Expand All @@ -16,7 +16,6 @@
<allow-intent href="sms:*"/>
<allow-intent href="mailto:*"/>
<allow-intent href="geo:*"/>

<platform name="android">
<preference name="scheme" value="http"/>
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
Expand All @@ -29,7 +28,6 @@
<icon density="xhdpi" src="assets/icons/android/drawable-xhdpi-icon.png"/>
<icon density="xxhdpi" src="assets/icons/android/drawable-xxhdpi-icon.png"/>
<icon density="xxxhdpi" src="assets/icons/android/drawable-xxxhdpi-icon.png"/>

<preference name="AndroidWindowSplashScreenAnimatedIcon" value="assets/icons/android/splash.png"/>
</platform>
<platform name="ios">
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "casa.casanet.dashboard",
"displayName": "casanet",
"version": "1.0.21",
"version": "1.0.40",
"license": "GNU3",
"main": "index.js",
"private": false,
Expand Down
4 changes: 4 additions & 0 deletions src/services/minions.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ export interface Minion extends ApiMinion {
readonly?: boolean;
}

export interface Minion extends ApiMinion {
readonly?: boolean;
}

function sortMinionsFormula(a: Minion, b: Minion): number {
return a.name?.toLowerCase() < b.name?.toLowerCase() ? -1 : 1;
}
Expand Down
Loading