Skip to content

Commit a6b174a

Browse files
authored
Set up CI and clean up (#3)
1 parent 6950bb1 commit a6b174a

File tree

40 files changed

+143
-1080
lines changed

40 files changed

+143
-1080
lines changed

docker/ui/docker-entrypoint.sh renamed to .dockerignore

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
#!/bin/bash
18-
19-
set -e
20-
21-
export LOGGING_CONFIG="webapp/logback.xml"
22-
23-
if [[ ! -z "$SW_OAP_ADDRESS" ]]; then
24-
address_arr=(${SW_OAP_ADDRESS//,/ })
25-
for i in "${!address_arr[@]}"
26-
do
27-
JAVA_OPTS="${JAVA_OPTS} -Dspring.cloud.discovery.client.simple.instances.oap-service[$i].uri=${address_arr[$i]}"
28-
done
29-
fi
30-
31-
exec java ${JAVA_OPTS} -jar webapp/skywalking-webapp.jar "$@"
17+
*
18+
!skywalking-agent
19+
skywalking-agent/logs

.github/ISSUE_TEMPLATE

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

.github/actions/plugins-test/action.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ runs:
3333
uses: actions/cache@v2
3434
with:
3535
path: ~/.m2/repository
36-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
37-
restore-keys: |
38-
${{ runner.os }}-maven-agent-
36+
key: ${{ runner.os }}-maven-agent-test
37+
restore-keys: ${{ runner.os }}-maven-agent-test
3938
- name: Check License
4039
uses: apache/skywalking-eyes@a63f4afcc287dfb3727ecc45a4afc55a5e69c15f
4140
- name: Add checkstyle-plugin
@@ -66,11 +65,3 @@ runs:
6665
echo "::group::Run Plugin Test ${{ inputs.test_case }}"
6766
bash test/plugin/run.sh --image_version=${{ inputs.java_version }}-1.0.0 ${{ inputs.test_case }}
6867
echo "::endgroup::"
69-
- name: Report Coverage
70-
shell: bash
71-
env:
72-
CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
73-
run: |
74-
echo "::group::Uploading Code Coverage"
75-
bash -x tools/coverage/report.sh
76-
echo "::endgroup::"

.github/actions/skip/action.yml

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

.github/workflows/ci-it.yaml

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

.github/workflows/ci.yaml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
name: CI
18+
19+
on:
20+
pull_request:
21+
schedule:
22+
- cron: '0 18 * * *' # TimeZone: UTC 0
23+
24+
concurrency:
25+
group: ci-it-${{ github.event.pull_request.number || github.ref }}
26+
cancel-in-progress: true
27+
28+
jobs:
29+
matrix:
30+
name: ${{ matrix.os }} - ${{ matrix.java-version }}
31+
if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking-java') || (github.event_name != 'schedule')
32+
runs-on: ${{ matrix.os }}-latest
33+
timeout-minutes: 60
34+
strategy:
35+
fail-fast: true
36+
matrix:
37+
os: [ ubuntu, macos, windows ]
38+
java-version: [ 8 ]
39+
include:
40+
- os: ubuntu
41+
java-version: 11
42+
steps:
43+
- uses: actions/checkout@v2
44+
with:
45+
submodules: true
46+
- name: Check License Header
47+
if: matrix.os == 'ubuntu' # Container GHA is only supported in Linux system
48+
uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587
49+
env:
50+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51+
- name: Cache local Maven repository
52+
uses: actions/cache@v2
53+
with:
54+
path: ~/.m2/repository
55+
key: ${{ runner.os }}-maven-ci-${{ matrix.os }}
56+
restore-keys: ${{ runner.os }}-maven-${{ matrix.os }}
57+
- uses: actions/setup-java@v2
58+
with:
59+
distribution: adopt
60+
java-version: ${{ matrix.java-version }}
61+
- name: Check Javaagent Plugin List
62+
run: tools/plugin/check-javaagent-plugin-list.sh
63+
- name: Install and Test
64+
if: matrix.java-version == '8'
65+
run: ./mvnw -q --batch-mode clean verify install javadoc:javadoc
66+
- name: Install and Test
67+
if: matrix.java-version == '11'
68+
run: ./mvnw -q --batch-mode clean verify install
69+
70+
ci:
71+
name: CI
72+
runs-on: ubuntu-latest
73+
needs: [ matrix ]
74+
steps:
75+
- run: echo 'Success'

.github/workflows/codeql.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ name: "CodeQL"
1818

1919
on:
2020
push:
21-
branches: [ 'master' ]
21+
branches: [ 'main' ]
2222
pull_request:
23-
branches: [ 'master' ]
23+
branches: [ 'main' ]
2424
schedule:
2525
- cron: '28 3 * * *'
2626

0 commit comments

Comments
 (0)