Skip to content

Commit

Permalink
Update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
aashna-narula-cko committed Feb 6, 2024
1 parent 5b3fd92 commit 5ecb5f4
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
9 changes: 9 additions & 0 deletions .github/scripts/run_sonar.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
sonar-scanner \
-Dsonar.organization=checkout-ltd \
-Dsonar.projectKey=checkout_checkout-3ds-sdk-ios \
-Dsonar.sources=. \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.cfamily.build-wrapper-output.bypass=true \
-Dsonar.c.file.suffixes=- \
-Dsonar.cpp.file.suffixes=- \
-Dsonar.objc.file.suffixes=-
16 changes: 7 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
name: SonarCloud
name: Run SonarCloud Analysis
on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened]

jobs:
build:
name: Build and analyze
runs-on: macos-latest
env:
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
steps:
- uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Install sonar-scanner and build-wrapper
uses: SonarSource/sonarcloud-github-c-cpp@v2
- name: Run build-wrapper
run: |
build-wrapper-macosx-x86 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} xcodebuild clean build

- name: Run sonar-scanner
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: |
sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
run: sh .github/scripts/run_sonar.sh
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: security-and-quality
Expand All @@ -51,4 +51,4 @@ jobs:
xcodebuild -scheme Checkout3DSPackages -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=latest"
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
13 changes: 3 additions & 10 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
sonar.projectKey=checkout_checkout-3ds-sdk-ios
sonar.organization=checkout-ltd

# This is the name and version displayed in the SonarCloud UI.
#sonar.projectName=checkout-3ds-sdk-ios
#sonar.projectVersion=1.0


# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
#sonar.sources=.

# Encoding of the source code. Default is default system encoding
#sonar.sourceEncoding=UTF-8
sonar.sourceEncoding=UTF-8
sonar.projectVersion=1.0
sonar.sources=src

0 comments on commit 5ecb5f4

Please sign in to comment.