Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/oe-alliance/ofgwrite
Browse files Browse the repository at this point in the history
  • Loading branch information
vanhofen committed Oct 29, 2022
2 parents 5f6cc20 + f45fe98 commit a6719ac
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 1 deletion.
47 changes: 47 additions & 0 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Sonar
on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build
runs-on: ubuntu-latest
env:
SONAR_SCANNER_VERSION: 4.7.0.2747
SONAR_SERVER_URL: "https://sonarcloud.io"
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Download and set up sonar-scanner
env:
SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
run: |
mkdir -p $HOME/.sonar
curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }}
unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH
- name: Download and set up build-wrapper
env:
BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip
run: |
curl -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}
unzip -o $HOME/.sonar/build-wrapper-linux-x86.zip -d $HOME/.sonar/
echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH
- name: Run build-wrapper
run: |
build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make
- name: Run sonar-scanner
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: |
sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
1 change: 1 addition & 0 deletions busybox/fuser.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ static smallint scan_recursive(const char *path)
|| strcmp(ln, "/oldroot/usr/share/platform/dvb_init.bin") == 0
|| strcmp(ln, "/oldroot/usr/share/platform/nxserver") == 0
|| strcmp(ln, "/oldroot/usr/bin/showiframe") == 0
|| strcmp(ln, "/oldroot/sbin/mount.exfat-fuse") == 0
|| ( strncmp(ln, "/oldroot/lib/modules/", 21) == 0
&& strstr(ln, "/extra/hi_play.ko") != NULL )
)
Expand Down
2 changes: 1 addition & 1 deletion ofgwrite.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ char rootfs_mount_point[1000];
enum RootfsTypeEnum rootfs_type;
int stop_neutrino_needed = 1;

const char ofgwrite_version[] = "4.6.1";
const char ofgwrite_version[] = "4.6.2";

struct struct_mountlist
{
Expand Down
12 changes: 12 additions & 0 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
sonar.projectKey=oe-alliance_ofgwrite
sonar.organization=oe-alliance

# This is the name and version displayed in the SonarCloud UI.
sonar.projectName=ofgwrite
sonar.projectVersion=4.6.1

# 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

0 comments on commit a6719ac

Please sign in to comment.