Skip to content

Commit 9ddb2bf

Browse files
authored
Merge pull request #74 from mertcelen/1.1-dev
New logo added. Version code simplified. Module version control check added. Extension version control check reenabled. Password change visual renewed. Module update mechanism added. Havelsan logo added. Github actions cache support added.
2 parents ff93f44 + 201b63d commit 9ddb2bf

File tree

108 files changed

+658
-18691
lines changed

Some content is hidden

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

108 files changed

+658
-18691
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@ jobs:
1010
with:
1111
path: package/liman/server
1212

13-
- name: Checking code format
14-
run: |
15-
sudo apt install npm -y
16-
cd package/liman/server/
17-
npm install
18-
npm run check
19-
2013
- name: Getting Liman' PHP Sandbox
2114
uses: actions/checkout@v2
2215
with:
@@ -37,7 +30,17 @@ jobs:
3730
repository: mertcelen/webssh
3831
path: package/liman/webssh
3932
token: ${{ secrets.CI_TOKEN }}
40-
33+
- name: Get Composer Cache Directory
34+
id: composer-cache
35+
run: |
36+
cd package/liman/server
37+
echo "::set-output name=dir::$(composer config cache-files-dir)"
38+
- uses: actions/cache@v2
39+
with:
40+
path: ${{ steps.composer-cache.outputs.dir }}
41+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
42+
restore-keys: |
43+
${{ runner.os }}-composer-
4144
- name: Set up Liman Environment
4245
uses: shivammathur/setup-php@v2
4346
with:
@@ -48,12 +51,11 @@ jobs:
4851
run: |
4952
DEBIAN_FRONTEND=noninteractive sudo apt install jq -y 1>/dev/null 2>/dev/null
5053
VERSION=`cat package/liman/server/storage/VERSION`
51-
echo $GITHUB_RUN_ID > package/liman/server/storage/VERSION_CODE
54+
echo $GITHUB_RUN_NUMBER > package/liman/server/storage/VERSION_CODE
5255
COMMIT="${GITHUB_REF#refs/heads/} : "
5356
COMMIT+=`git --git-dir=package/liman/server/.git log -1 --pretty=%B`
5457
COMMIT=`echo $COMMIT | jq -SrR @uri`
5558
DATE=$(date)
56-
composer clearcache
5759
composer install --no-dev -d package/liman/server
5860
git --git-dir=package/liman/server/.git log -30 --pretty=format:"%s%x09%ad" > package/liman/server/storage/changelog
5961
rm -rf package/liman/server/.git package/liman/sandbox/php/.git package/liman/sandbox/python/.git
@@ -71,8 +73,8 @@ jobs:
7173
chmod 775 DEBIAN/postinst
7274
7375
echo """Package: Liman
74-
Version: $VERSION-$GITHUB_RUN_ID
75-
Installed-Size: 29892
76+
Version: $VERSION-$GITHUB_RUN_NUMBER
77+
Installed-Size: 77892
7678
Maintainer: Mert CELEN <mcelen@havelsan.com.tr>
7779
Section: admin
7880
Date : $DATE
@@ -84,5 +86,5 @@ jobs:
8486
cd ../
8587
dpkg-deb -Zgzip --build package
8688
[ "$GITHUB_REF" == "refs/heads/master" ] && CHANNEL="liman-release" || CHANNEL="liman-dev-release"
87-
[ "$GITHUB_REF" == "refs/heads/master" ] && FILE_NAME="liman-$VERSION-$GITHUB_RUN_ID.deb" || FILE_NAME="liman-${GITHUB_REF#refs/heads/}-$VERSION-$GITHUB_RUN_ID.deb"
89+
[ "$GITHUB_REF" == "refs/heads/master" ] && FILE_NAME="liman-$VERSION-$GITHUB_RUN_NUMBER.deb" || FILE_NAME="liman-${GITHUB_REF#refs/heads/}-$VERSION-$GITHUB_RUN_NUMBER.deb"
8890
curl -F "file=@/home/runner/work/liman/liman/package.deb" "https://slack.com/api/files.upload?token=xoxb-474187933397-695167035444-NFLf9tgYahuMsmeT7rwp5wnD&channels=$CHANNEL&filename=$FILE_NAME&pretty=1&initial_comment=$COMMIT" || echo

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ composer.lock
1919
vendor/*
2020
/public/sqlite.php
2121
.env
22-
config/liman.php
22+
config/liman.php
23+
storage/extension_updates

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 liman
3+
Copyright (c) 2020 Liman MYS
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# LIMAN MYS
22

3+
[Liman MYS Kurumsal Website](https://liman.havelsan.com.tr/)
4+
35
![Liman CI](https://github.com/mertcelen/liman/workflows/Liman%20CI/badge.svg)

0 commit comments

Comments
 (0)