Skip to content

Commit bda5440

Browse files
Merge branch 'master' into fix-big-integer
2 parents a387273 + 02aa4bb commit bda5440

File tree

4 files changed

+5
-18
lines changed

4 files changed

+5
-18
lines changed

.github/workflows/build.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ on:
66
action:
77
required: true
88
type: string
9-
travis_tag:
10-
required: true
11-
type: string
129
secrets:
1310
MAVEN_SIGNING_KEY_BASE64:
1411
required: true
@@ -37,4 +34,4 @@ jobs:
3734
MAVEN_SIGNING_PASSPHRASE: ${{ secrets.MAVEN_SIGNING_PASSPHRASE }}
3835
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
3936
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
40-
run: TRAVIS_TAG=${{ inputs.travis_tag }} ./gradlew ${{ inputs.action }}
37+
run: ./gradlew ${{ inputs.action }}

.github/workflows/integration_test.yml

+3-10
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ on:
99
secrets:
1010
CI_USER_TOKEN:
1111
required: true
12-
TRAVIS_COM_TOKEN:
13-
required: true
1412
jobs:
1513
test:
1614
runs-on: ubuntu-latest
@@ -19,23 +17,21 @@ jobs:
1917
with:
2018
# You should create a personal access token and store it in your repository
2119
token: ${{ secrets.CI_USER_TOKEN }}
22-
repository: 'optimizely/travisci-tools'
23-
path: 'home/runner/travisci-tools'
20+
repository: 'optimizely/ci-helper-tools'
21+
path: 'home/runner/ci-helper-tools'
2422
ref: 'master'
2523
- name: set SDK Branch if PR
2624
env:
2725
HEAD_REF: ${{ github.head_ref }}
2826
if: ${{ github.event_name == 'pull_request' }}
2927
run: |
3028
echo "SDK_BRANCH=$HEAD_REF" >> $GITHUB_ENV
31-
echo "TRAVIS_BRANCH=$HEAD_REF" >> $GITHUB_ENV
3229
- name: set SDK Branch if not pull request
3330
env:
3431
REF_NAME: ${{ github.ref_name }}
3532
if: ${{ github.event_name != 'pull_request' }}
3633
run: |
3734
echo "SDK_BRANCH=$REF_NAME" >> $GITHUB_ENV
38-
echo "TRAVIS_BRANCH=$REF_NAME" >> $GITHUB_ENV
3935
- name: Trigger build
4036
env:
4137
SDK: java
@@ -45,16 +41,13 @@ jobs:
4541
GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }}
4642
EVENT_TYPE: ${{ github.event_name }}
4743
GITHUB_CONTEXT: ${{ toJson(github) }}
48-
#REPO_SLUG: ${{ github.repository }}
4944
PULL_REQUEST_SLUG: ${{ github.repository }}
5045
UPSTREAM_REPO: ${{ github.repository }}
5146
PULL_REQUEST_SHA: ${{ github.event.pull_request.head.sha }}
5247
PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
5348
UPSTREAM_SHA: ${{ github.sha }}
54-
TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
55-
TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
5649
EVENT_MESSAGE: ${{ github.event.message }}
5750
HOME: 'home/runner'
5851
run: |
5952
echo "$GITHUB_CONTEXT"
60-
home/runner/travisci-tools/trigger-script-with-status-update.sh
53+
home/runner/ci-helper-tools/trigger-script-with-status-update.sh

.github/workflows/java.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ jobs:
3131

3232
integration_tests:
3333
if: ${{ startsWith(github.ref, 'refs/tags/') != true && github.event.inputs.SNAPSHOT != 'true' }}
34-
uses: optimizely/java-sdk/.github/workflows/integration_test.yml@mnoman/fsc-gitaction-test
34+
uses: optimizely/java-sdk/.github/workflows/integration_test.yml@master
3535
secrets:
3636
CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }}
37-
TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
3837

3938
fullstack_production_suite:
4039
if: ${{ startsWith(github.ref, 'refs/tags/') != true && github.event.inputs.SNAPSHOT != 'true' }}
@@ -43,7 +42,6 @@ jobs:
4342
FULLSTACK_TEST_REPO: ProdTesting
4443
secrets:
4544
CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }}
46-
TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
4745

4846
test:
4947
if: ${{ startsWith(github.ref, 'refs/tags/') != true && github.event.inputs.SNAPSHOT != 'true' }}

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Optimizely Java SDK
22

3-
[![Build Status](https://travis-ci.org/optimizely/java-sdk.svg?branch=master)](https://travis-ci.org/optimizely/java-sdk)
43
[![Apache 2.0](https://img.shields.io/badge/license-APACHE%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
54

65
This repository houses the Java SDK for use with Optimizely Feature Experimentation and Optimizely Full Stack (legacy).

0 commit comments

Comments
 (0)