Skip to content

Commit

Permalink
Merge 7f651ea into 6033905
Browse files Browse the repository at this point in the history
  • Loading branch information
coolbeevip committed Mar 16, 2021
2 parents 6033905 + 7f651ea commit ab08c7f
Show file tree
Hide file tree
Showing 10 changed files with 278 additions and 236 deletions.
29 changes: 10 additions & 19 deletions .travis.settings.xml → .github/asf-deploy-settings.xml 100755 → 100644
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
Expand All @@ -15,28 +16,18 @@
~ limitations under the License.
-->

<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">

<servers>
<server>
<id>apache.snapshots.https</id>
<username>${env.SONATYPE_USERNAME}</username>
<password>${env.SONATYPE_PASSWORD}</password>
<username>${env.NEXUS_DEPLOY_USERNAME}</username>
<password>${env.NEXUS_DEPLOY_PASSWORD}</password>
</server>
<server>
<id>apache.releases.https</id>
<username>${env.SONATYPE_USERNAME}</username>
<password>${env.SONATYPE_PASSWORD}</password>
</server>
</servers>
<profiles>
<profile>
<id>passphrase</id> <!-- give it the name of your project -->
<properties>
<gpg.homedir>/home/travis/build/apache/incubator-servicecomb-saga</gpg.homedir>
<gpg.keyname>2DE9D2F9</gpg.keyname>
<gpg.passphrase>${env.MYPASSP}</gpg.passphrase>
</properties>
</profile>
</profiles>

</settings>
98 changes: 98 additions & 0 deletions .github/workflows/asf-snapshots-deploy.yml
@@ -0,0 +1,98 @@
## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
## The ASF licenses this file to You under the Apache License, Version 2.0
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------

name: deploy snapshot

on:
schedule:
- cron: '0 2 * * *'
workflow_dispatch:

env:
MAVEN_OPTS: -Xmx4g -Xms1g -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

jobs:
build:
timeout-minutes: 180
runs-on: ubuntu-20.04
strategy:
matrix:
java: [ '1.8' ]
steps:
- uses: actions/checkout@v2
with:
persist-credentials: false
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- name: Cache Maven Repository
uses: actions/cache@v2
with:
path: |
~/.m2/repository/
!~/.m2/repository/org/apache/servicecomb
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Show the first log message
run: git log -n1
- name: Build and test
if: ${{ success() }}
run: ./mvnw clean install -B -Pjacoco -Pdocker coveralls:report -DrepoToken=${COVERALLS_TOKEN}
- name: Upload unit test results
if: ${{ failure() }}
uses: actions/upload-artifact@v2
with:
name: surefire-reports
path: ./**/target/surefire-reports/
if-no-files-found: ignore
- name: Verify demo
if: ${{ success() }}
run: ./mvnw clean verify -B -f demo -Pdemo -Pdocker -Ddocker.useColor=false -Ddocker.showLogs
- name: Verify Acceptance tests
if: ${{ success() }}
run: ./mvnw clean verify -B -f acceptance-tests -Pdemo -Pdocker -Ddocker.useColor=false -Ddocker.showLogs

deploy:
runs-on: ubuntu-20.04
strategy:
matrix:
java: [ '1.8' ]
needs: build
if: github.ref == 'refs/heads/master'
env:
NEXUS_DEPLOY_USERNAME: ${{ secrets.NEXUS_USER }}
NEXUS_DEPLOY_PASSWORD: ${{ secrets.NEXUS_PW }}
steps:
- uses: actions/checkout@v2
with:
persist-credentials: false
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- name: Cache Maven Repository
uses: actions/cache@v2
with:
path: |
~/.m2/repository/
!~/.m2/repository/org/apache/servicecomb
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Deploy to ASF Snapshots Repository
run: mvn clean deploy -B -Ddocker.skip -DskipTests --settings .github/asf-deploy-settings.xml
86 changes: 0 additions & 86 deletions .github/workflows/ci.yaml

This file was deleted.

68 changes: 68 additions & 0 deletions .github/workflows/master-pr-build.yaml
@@ -0,0 +1,68 @@
## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
## The ASF licenses this file to You under the Apache License, Version 2.0
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------

name: master pr build

on:
pull_request:
branches:
- master

env:
MAVEN_OPTS: -Xmx4g -Xms1g -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3

jobs:
mvn:
timeout-minutes: 180
runs-on: ubuntu-20.04
strategy:
matrix:
java: [ '1.8' ]
steps:
- uses: actions/checkout@v2
with:
persist-credentials: false
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- name: Cache Maven Repository
uses: actions/cache@v2
with:
path: |
~/.m2/repository/
!~/.m2/repository/org/apache/servicecomb
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Show the first log message
run: git log -n1
- name: Build and test
if: ${{ success() }}
run: ./mvnw clean install -B -Pjacoco -Pdocker coveralls:report -DrepoToken=ftogh57jTQ0GRa4AaOgFfltiUrwnO8tw9
- name: Upload unit test results
if: ${{ failure() }}
uses: actions/upload-artifact@v2
with:
name: surefire-reports
path: ./**/target/surefire-reports/
if-no-files-found: ignore
- name: Verify demo
if: ${{ success() }}
run: ./mvnw clean verify -B -f demo -Pdemo -Pdocker -Ddocker.useColor=false -Ddocker.showLogs
- name: Verify Acceptance tests
if: ${{ success() }}
run: ./mvnw clean verify -B -f acceptance-tests -Pdemo -Pdocker -Ddocker.useColor=false -Ddocker.showLogs
69 changes: 69 additions & 0 deletions .github/workflows/master-push-build.yaml
@@ -0,0 +1,69 @@
## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
## The ASF licenses this file to You under the Apache License, Version 2.0
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------

name: master push build

on:
push:
branches:
- master

env:
MAVEN_OPTS: -Xmx4g -Xms1g -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

jobs:
mvn:
timeout-minutes: 180
runs-on: ubuntu-20.04
strategy:
matrix:
java: [ '1.8' ]
steps:
- uses: actions/checkout@v2
with:
persist-credentials: false
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- name: Cache Maven Repository
uses: actions/cache@v2
with:
path: |
~/.m2/repository/
!~/.m2/repository/org/apache/servicecomb
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Show the first log message
run: git log -n1
- name: Build and test
if: ${{ success() }}
run: ./mvnw clean install -B -Pjacoco -Pdocker coveralls:report -DrepoToken=${COVERALLS_TOKEN}
- name: Upload unit test results
if: ${{ failure() }}
uses: actions/upload-artifact@v2
with:
name: surefire-reports
path: ./**/target/surefire-reports/
if-no-files-found: ignore
- name: Verify demo
if: ${{ success() }}
run: ./mvnw clean verify -B -f demo -Pdemo -Pdocker -Ddocker.useColor=false -Ddocker.showLogs
- name: Verify Acceptance tests
if: ${{ success() }}
run: ./mvnw clean verify -B -f acceptance-tests -Pdemo -Pdocker -Ddocker.useColor=false -Ddocker.showLogs

0 comments on commit ab08c7f

Please sign in to comment.