Skip to content

Commit d09ea54

Browse files
authored
Merge branch 'master' into effect-camera
2 parents cceab77 + 9464905 commit d09ea54

File tree

3 files changed

+80
-71
lines changed

3 files changed

+80
-71
lines changed

.github/workflows/main.yaml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Build and Deploy Java Project
2+
3+
on:
4+
push:
5+
branches: [ '**' ]
6+
tags: [ '*' ]
7+
pull_request:
8+
branches: [ '**' ]
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-22.04 # Ubuntu Jammy equivalent
13+
14+
steps:
15+
- uses: actions/checkout@v3
16+
17+
- name: Set up JDK 17
18+
uses: actions/setup-java@v3
19+
with:
20+
java-version: '17'
21+
distribution: 'temurin' # AdoptOpenJDK's new name
22+
cache: 'maven'
23+
24+
- name: Set up Node.js
25+
uses: actions/setup-node@v3
26+
with:
27+
node-version: '16.20.2'
28+
cache: 'npm'
29+
30+
31+
- name: Import GPG key
32+
run: |
33+
echo "${{ secrets.GPG_PRIVATE_KEY }}" | gpg --batch --yes --import
34+
gpg --list-keys
35+
36+
- name: Clone and build parent project
37+
run: |
38+
git clone --depth=1 -b ${{ github.ref_name }} https://github.com/ant-media/ant-media-server-parent.git || git clone --depth=1 https://github.com/ant-media/ant-media-server-parent.git
39+
cd ant-media-server-parent
40+
mvn clean install -DskipTests -Dmaven.javadoc.skip=true -Dgpg.skip=true --quiet
41+
cd ..
42+
43+
- name: Clone and build server project
44+
run: |
45+
git clone --depth=1 -b ${{ github.ref_name }} https://github.com/ant-media/Ant-Media-Server.git || git clone --depth=1 https://github.com/ant-media/Ant-Media-Server.git
46+
cd Ant-Media-Server
47+
mvn clean install -DskipTests -Dmaven.javadoc.skip=true -Dgpg.skip=true --quiet
48+
cd ..
49+
50+
- name: Install and compile npm packages
51+
run: |
52+
pwd
53+
ls -alh
54+
npm install
55+
npm run compile
56+
cd embedded-player
57+
npm install
58+
npm run compile
59+
npm run deploy
60+
cd ..
61+
62+
- name: Install Maven packages
63+
run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true -B -V --quiet
64+
65+
- name: Deploy Snapshot
66+
run: mvn deploy -DskipTests --quiet --settings mvn-settings.xml
67+
env:
68+
# Add your Maven credentials as secrets
69+
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
70+
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
71+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
72+
73+
- name: Deploy Release
74+
if: startsWith(github.ref, 'refs/tags/ams-v')
75+
run: mvn deploy -DskipTests --quiet --settings mvn-settings.xml
76+
env:
77+
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
78+
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
79+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

.travis.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/main/webapp/player.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ <h3 class="col text-muted">
7777
</div>
7878

7979

80-
<div class="form-group">
80+
<div class="form-group" style="margin-top:10px"> <!-- just spacing to make selenium to not fire elementclickinterceptedexception-->
8181
<button class="btn btn-primary" id="start_play_button">Start
8282
Playing</button>
8383
<button class="btn btn-primary" id="stop_play_button">Stop

0 commit comments

Comments
 (0)