Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: repo structure #61

Merged
merged 5 commits into from
Aug 15, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: |
echo ${{ secrets.DOCKER_TOKEN }} | docker login ghcr.io -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
docker run -td --name unreal --user root \
-v ${{ github.workspace }}:/sentry-unreal \
-v ${{ github.workspace }}/plugin-dev:/sentry-unreal \
--workdir /sentry-unreal \
ghcr.io/epicgames/unreal-engine:dev-slim-${{ matrix.unreal }}

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
native-linux:
uses: getsentry/github-workflows/.github/workflows/updater.yml@v1
with:
path: Scripts/update-native-linux.sh
path: scripts/update-native-linux.sh
name: Native SDK (Linux)
runs-on: ubuntu-latest
secrets:
Expand All @@ -23,7 +23,7 @@ jobs:
native-windows:
uses: getsentry/github-workflows/.github/workflows/updater.yml@v1
with:
path: Scripts/update-native-windows.ps1
path: scripts/update-native-windows.ps1
name: Native SDK (Windows)
runs-on: windows-latest
secrets:
Expand All @@ -32,7 +32,7 @@ jobs:
native-mac:
uses: getsentry/github-workflows/.github/workflows/updater.yml@v1
with:
path: Scripts/update-native-mac.sh
path: scripts/update-native-mac.sh
name: Native SDK (Mac)
runs-on: macos-latest
secrets:
Expand All @@ -41,7 +41,7 @@ jobs:
java:
uses: getsentry/github-workflows/.github/workflows/updater.yml@v1
with:
path: Scripts/update-java.sh
path: scripts/update-java.sh
name: Java SDK (Android)
runs-on: ubuntu-latest
secrets:
Expand All @@ -50,7 +50,7 @@ jobs:
cocoa:
uses: getsentry/github-workflows/.github/workflows/updater.yml@v1
with:
path: Scripts/update-cocoa.sh
path: scripts/update-cocoa.sh
name: Cocoa SDK (iOS)
runs-on: macos-latest
secrets:
Expand Down
18 changes: 9 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "Modules/sentry-java"]
path = Modules/sentry-java
url = https://github.com/getsentry/sentry-java.git
[submodule "Modules/sentry-native"]
path = Modules/sentry-native
url = https://github.com/getsentry/sentry-native.git
[submodule "Modules/sentry-cocoa"]
path = Modules/sentry-cocoa
url = https://github.com/getsentry/sentry-cocoa
[submodule "modules/sentry-java"]
path = modules/sentry-java
url = https://github.com/getsentry/sentry-java.git
[submodule "modules/sentry-native"]
path = modules/sentry-native
url = https://github.com/getsentry/sentry-native.git
[submodule "modules/sentry-cocoa"]
path = modules/sentry-cocoa
url = https://github.com/getsentry/sentry-cocoa
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing

We love receiving PRs from the community with features and fixes.
We love receiving PRs from the community with features and fixes.
For big feature it's advised to raise an issue to discuss it first.

## Getting started
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ NS_SWIFT_NAME(Event)
@property (nonatomic, strong) NSDictionary<NSString *, id> *_Nullable sdk;

/**
* Modules of the event
* modules of the event
*/
@property (nonatomic, strong) NSDictionary<NSString *, NSString *> *_Nullable modules;

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions Scripts/update-cocoa.sh → scripts/update-cocoa.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
set -euo pipefail

submodulePath=$"Modules/sentry-cocoa"
submodulePath=$"modules/sentry-cocoa"
targetPlatform=$"iOS"

case $1 in
get-version)
git submodule update --init --no-fetch --single-branch $submodulePath > /dev/null
git submodule update --init --no-fetch --single-branch $submodulePath >/dev/null
version=$(git -C $submodulePath describe --tags)
echo $version
;;
Expand All @@ -17,14 +17,14 @@ set-version)
version=$2

git -C $submodulePath checkout $version

./Scripts/checkout-submodule.sh $submodulePath
./Scripts/build-cocoa.sh $submodulePath Source/ThirdParty/$targetPlatform

echo "Setting submodule version to '$version'"
./scripts/checkout-submodule.sh $submodulePath
./scripts/build-cocoa.sh $submodulePath plugin-dev/Source/ThirdParty/$targetPlatform

echo "Setting submodule version to '$version'"
;;
*)
echo "Unknown argument $1"
exit 1
;;
esac
esac
16 changes: 8 additions & 8 deletions Scripts/update-java.sh → scripts/update-java.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
set -euo pipefail

submodulePath=$"Modules/sentry-java"
submodulePath=$"modules/sentry-java"
targetPlatform=$"Android"

case $1 in
get-version)
git submodule update --init --no-fetch --single-branch $submodulePath > /dev/null
git submodule update --init --no-fetch --single-branch $submodulePath >/dev/null
version=$(git -C $submodulePath describe --tags)
echo $version
;;
Expand All @@ -17,16 +17,16 @@ set-version)
version=$2

git -C $submodulePath checkout $version

./Scripts/checkout-submodule.sh $submodulePath
./Scripts/build-java.sh $submodulePath Source/ThirdParty/$targetPlatform

./Scripts/bump-version-android.sh $version
./scripts/checkout-submodule.sh $submodulePath
./scripts/build-java.sh $submodulePath plugin-dev/Source/ThirdParty/$targetPlatform

echo "Setting submodule version to '$version'"
./scripts/bump-version-android.sh $version

echo "Setting submodule version to '$version'"
;;
*)
echo "Unknown argument $1"
exit 1
;;
esac
esac
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
set -euo pipefail

submodulePath=$"Modules/sentry-native"
submodulePath=$"modules/sentry-native"
targetPlatform=$"Linux"

case $1 in
get-version)
git submodule update --init --no-fetch --single-branch $submodulePath > /dev/null
git submodule update --init --no-fetch --single-branch $submodulePath >/dev/null
version=$(git -C $submodulePath describe --tags)
echo $version
;;
Expand All @@ -20,14 +20,14 @@ set-version)
sudo apt-get install zlib1g-dev libcurl4-openssl-dev libssl-dev

git -C $submodulePath checkout $version

./Scripts/checkout-submodule.sh $submodulePath
./Scripts/build-native-linux.sh $submodulePath Source/ThirdParty/$targetPlatform

echo "Setting submodule version to '$version'"
./scripts/checkout-submodule.sh $submodulePath
./scripts/build-native-linux.sh $submodulePath plugin-dev/Source/ThirdParty/$targetPlatform

echo "Setting submodule version to '$version'"
;;
*)
echo "Unknown argument $1"
exit 1
;;
esac
esac
14 changes: 7 additions & 7 deletions Scripts/update-native-mac.sh → scripts/update-native-mac.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
set -euo pipefail

submodulePath=$"Modules/sentry-native"
submodulePath=$"modules/sentry-native"
targetPlatform=$"Mac"

case $1 in
get-version)
git submodule update --init --no-fetch --single-branch $submodulePath > /dev/null
git submodule update --init --no-fetch --single-branch $submodulePath >/dev/null
version=$(git -C $submodulePath describe --tags)
echo $version
;;
Expand All @@ -17,14 +17,14 @@ set-version)
version=$2

git -C $submodulePath checkout $version

./Scripts/checkout-submodule.sh $submodulePath
./Scripts/build-native-mac.sh $submodulePath Source/ThirdParty/$targetPlatform

echo "Setting submodule version to '$version'"
./scripts/checkout-submodule.sh $submodulePath
./scripts/build-native-mac.sh $submodulePath plugin-dev/Source/ThirdParty/$targetPlatform

echo "Setting submodule version to '$version'"
;;
*)
echo "Unknown argument $1"
exit 1
;;
esac
esac
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
param([string] $Action,[string] $Tag)
param([string] $Action, [string] $Tag)

$submodulePath="Modules/sentry-native"
$targetPlatform="Win64"
$submodulePath = "modules/sentry-native"
$targetPlatform = "Win64"

function get-version ()
{
git submodule update --init --no-fetch --single-branch $submodulePath | out-null
git submodule update --init --no-fetch --single-branch $submodulePath | Out-Null
$version = $(git -C $submodulePath describe --tags)
return $version
}
Expand All @@ -22,7 +22,7 @@ function set-version ([string] $version)

git submodule foreach git submodule update --init --recursive

& ./Scripts/build-native-windows.ps1 $submodulePath Source/ThirdParty/$targetPlatform
& ./scripts/build-native-windows.ps1 $submodulePath plugin-dev/Source/ThirdParty/$targetPlatform
}

switch ($Action)
Expand Down