Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .bacon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,11 @@ test_suites:
script_name: publish
criteria: MERGE
queue_name: ci-queue-productionJenga-AL2023
- name: snyk
script_path: /root/okta/okta-react-native/scripts
script_name: snyk
sort_order: '4'
timeout: '200'
criteria: MAINLINE
queue_name: ci-queue-productionJenga-AL2023
trigger: AUTO
4 changes: 1 addition & 3 deletions .github/workflows/okta-react-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
run: yarn lint
- name: Test
run: yarn test
- name: Execute snyk.sh
run: bash ./scripts/snyk.sh
iOSUnitTests:
runs-on: macos-latest
steps:
Expand Down Expand Up @@ -52,7 +50,7 @@ jobs:
xcodebuild \
-workspace ios/ReactNativeOktaSdkBridge.xcworkspace \
-scheme "ReactNativeOktaSdkBridge" \
-destination "platform=iOS Simulator,OS=17.4,name=iPhone 15" \
-destination "platform=iOS Simulator,OS=26.5,name=iPhone 17" \
clean test | xcpretty
# iOSUITests:
# runs-on: macos-12
Expand Down
6 changes: 3 additions & 3 deletions android/forceVersions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ def forceVersions(ConfigurationContainer configurations) {
configurations.configureEach { configuration ->
configuration.resolutionStrategy {
force 'org.bouncycastle:bcprov-jdk18on:1.78.1'
force 'io.netty:netty-handler:4.1.125.Final'
force 'io.netty:netty-codec-http:4.1.125.Final'
force 'io.netty:netty-codec-http2:4.1.125.Final'
force 'io.netty:netty-handler:4.1.135.Final'
force 'io.netty:netty-codec-http:4.1.135.Final'
force 'io.netty:netty-codec-http2:4.1.135.Final'
force 'com.google.protobuf:protobuf-java:4.29.3'
}
}
Expand Down
2 changes: 1 addition & 1 deletion e2e/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: '34')
kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.25'

ndkVersion = "26.1.10909125"
ndkVersion = "27.1.12297006"
}
repositories {
google()
Expand Down
6 changes: 3 additions & 3 deletions e2e/android/forceVersions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ def forceVersions(ConfigurationContainer configurations) {
force 'junit:junit:4.13.2'
force 'commons-io:commons-io:2.15.1'
force 'commons-codec:commons-codec:1.17.0'
force 'io.netty:netty-handler:4.1.125.Final'
force 'io.netty:netty-codec-http:4.1.125.Final'
force 'io.netty:netty-codec-http2:4.1.125.Final'
force 'io.netty:netty-handler:4.1.135.Final'
force 'io.netty:netty-codec-http:4.1.135.Final'
force 'io.netty:netty-codec-http2:4.1.135.Final'
force 'com.google.protobuf:protobuf-java:3.25.6'
}
}
Expand Down
19 changes: 6 additions & 13 deletions scripts/snyk.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
#!/bin/bash
#!/bin/bash -x

# When packages change their dependency tree, we want to run snyk monitor. This
# sends the updated dependency tree to snyk for monitoring. We want to do this
# when a commit has been made to master, not on PRs because the dependency tree
# is likely still in flux while review is happening.
#
# For simplicity, this script just runs snyk monitor against all packages on
# master commits, it doesn't try to figure out which packages were updated.
source ${OKTA_HOME}/${REPO}/scripts/setup.sh

create_log_group "Snyk Scan"
dependency_scan
finish_log_group $?

if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then
yarn global add snyk
snyk auth $SNYK_API_TOKEN
echo "snyk monitor --org=$SNYK_ORG_ID"
fi
Loading