CI to UPM branch #19

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

Open

Hermesiss wants to merge 5 commits into SadPandaStudios:master from Hermesiss:develop

.gitignore

-Original file line number
+Diff line change
@@ -0,0 +1,40 @@
+    [Ll]ibrary/
+    [Tt]emp/
+    [Oo]bj/
+    [Bb]uild/
+    [Bb]uilds/
+    Assets/AssetStoreTools*
+    # Visual Studio cache directory
+    .vs/
+    # Autogenerated VS/MD/Consulo solution and project files
+    ExportedObj/
+    .consulo/
+    *.csproj
+    *.unityproj
+    *.sln
+    *.suo
+    *.tmp
+    *.user
+    *.userprefs
+    *.pidb
+    *.booproj
+    *.svd
+    *.pdb
+    *.opendb
+    # Unity3D generated meta files
+    *.pidb.meta
+    *.pdb.meta
+    # Unity3D Generated File On Crash Reports
+    sysinfo.txt
+    # Builds
+    *.apk
+    *.unitypackage
+    \.idea/
+    /src/*/bin
+    /src/*/obj

.travis.yml

-Original file line number
+Diff line change
@@ -0,0 +1,30 @@
+    language: generic
+    env:
+      - MASTER_TARGET_BRANCH=upm DEVELOP_TARGET_BRANCH=upm-dev TEST_TARGET_BRANCH=upm-test TARGET_BRANCH=not_defined TEST_RUN=false FOLDER_TO_EXPORT=Assets
+    sudo: required
+    before_install:
+      - |
+          if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+            TARGET_BRANCH=$TEST_TARGET_BRANCH
+          elif [ "$TRAVIS_BRANCH" = "develop" ]; then
+            TARGET_BRANCH=$DEVELOP_TARGET_BRANCH
+          elif [ "$TRAVIS_BRANCH" = "master" ]; then
+            TARGET_BRANCH=$MASTER_TARGET_BRANCH
+          else
+            TARGET_BRANCH=$TEST_TARGET_BRANCH
+          fi
+    after_success:
+      - chmod 777 -R Ci
+      - Ci/move_to_packagebranch.sh
+    branches:
+      only:
+        - master
+        - develop
+        - /^(?i:test).*$/
+      except:
+        - /^(?i:upm).*$/

AssetBundleManager.sln.DotSettings.meta

This file was deleted.

0 AssetBundleManager.meta → Assets/AssetBundleManager.meta

File renamed without changes.

0 AssetBundleManager/AssetBundleAsync.cs → ...ts/AssetBundleManager/AssetBundleAsync.cs

File renamed without changes.

0 AssetBundleManager/AssetBundleAsync.cs.meta → ...setBundleManager/AssetBundleAsync.cs.meta

File renamed without changes.

0 AssetBundleManager/AssetBundleDownloader.cs → ...setBundleManager/AssetBundleDownloader.cs

File renamed without changes.

0 ...ndleManager/AssetBundleDownloader.cs.meta → ...ndleManager/AssetBundleDownloader.cs.meta

File renamed without changes.

0 ...ger/AssetBundleDownloaderMonobehaviour.cs → ...ger/AssetBundleDownloaderMonobehaviour.cs

File renamed without changes.

0 ...ssetBundleDownloaderMonobehaviour.cs.meta → ...ssetBundleDownloaderMonobehaviour.cs.meta

File renamed without changes.

0 AssetBundleManager/AssetBundleManager.asmdef → ...etBundleManager/AssetBundleManager.asmdef

File renamed without changes.

0 ...dleManager/AssetBundleManager.asmdef.meta → ...dleManager/AssetBundleManager.asmdef.meta

File renamed without changes.

0 AssetBundleManager/AssetBundleManager.cs → .../AssetBundleManager/AssetBundleManager.cs

File renamed without changes.

0 ...tBundleManager/AssetBundleManager.cs.meta → ...tBundleManager/AssetBundleManager.cs.meta

File renamed without changes.

0 AssetBundleManager/AssetBundleUtility.cs → .../AssetBundleManager/AssetBundleUtility.cs

File renamed without changes.

0 ...tBundleManager/AssetBundleUtility.cs.meta → ...tBundleManager/AssetBundleUtility.cs.meta

File renamed without changes.

0 AssetBundleManager/EditorCoroutine.cs → Assets/AssetBundleManager/EditorCoroutine.cs

File renamed without changes.

0 AssetBundleManager/EditorCoroutine.cs.meta → ...ssetBundleManager/EditorCoroutine.cs.meta

File renamed without changes.

0 AssetBundleManager/Example.meta → Assets/AssetBundleManager/Example.meta

File renamed without changes.

0 AssetBundleManager/Example/Example1.cs → ...ts/AssetBundleManager/Example/Example1.cs

File renamed without changes.

0 AssetBundleManager/Example/Example1.cs.meta → ...setBundleManager/Example/Example1.cs.meta

File renamed without changes.

0 AssetBundleManager/Example/Example2.cs → ...ts/AssetBundleManager/Example/Example2.cs

File renamed without changes.

0 AssetBundleManager/Example/Example2.cs.meta → ...setBundleManager/Example/Example2.cs.meta

File renamed without changes.

0 AssetBundleManager/ICommandHandler.cs → Assets/AssetBundleManager/ICommandHandler.cs

File renamed without changes.

0 AssetBundleManager/ICommandHandler.cs.meta → ...ssetBundleManager/ICommandHandler.cs.meta

File renamed without changes.

0 ...StreamingAssetsBundleDownloadDecorator.cs → ...StreamingAssetsBundleDownloadDecorator.cs

File renamed without changes.

0 ...mingAssetsBundleDownloadDecorator.cs.meta → ...mingAssetsBundleDownloadDecorator.cs.meta

File renamed without changes.

Assets/package.json

-Original file line number
+Diff line change
@@ -0,0 +1,12 @@
+    {
+        "name": "asset-bundle-manager",
+        "displayName": "Asset Bundle Manager",
+        "version": "0.1.2",
+        "unity": "2019.1",
+        "description": "Yet another asset bundle manager for Unity",
+        "keywords": [
+            "unity",
+    		"bundle"
+        ],
+        "category": "Instrument"
+    }

Assets/package.json.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Ci/move_to_packagebranch.sh

-Original file line number
+Diff line change
@@ -0,0 +1,50 @@
+    #!/bin/bash
+    #set -e
+    set -x
+    #echo "git push"
+    REMOTE=$(git config --get remote.origin.url)
+    echo $REMOTE
+    COMMIT=$(git log -1 --pretty=%B)
+    echo $COMMIT
+    echo "TARGET_BRANCH is $TARGET_BRANCH"
+    git archive -o archive.tar HEAD:$FOLDER_TO_EXPORT
+    ARCHIVE_PATH=$(pwd)
+    mkdir ../$TARGET_BRANCH
+    cd ../$TARGET_BRANCH
+    if [ "$(git ls-remote $REMOTE $TARGET_BRANCH | wc -l)" != 1 ]; then
+        git clone --depth=1 $REMOTE
+        cd *
+        git checkout -b $TARGET_BRANCH
+    else
+        git clone --branch=$TARGET_BRANCH $REMOTE
+        cd *
+    fi
+    shopt -s extglob
+    rm ./ -dr -- !(.git)
+    mv $ARCHIVE_PATH/archive.tar archive.tar
+    echo "Archive content:"
+    tar -tf archive.tar
+    tar -xf archive.tar --overwrite
+    rm archive.tar
+    git add -A
+    echo "Diffs:"
+    git diff --cached
+    git config --global user.email "travis@travis-ci.org"
+    git config --global user.name "Travis CI"
+    git commit -m "$COMMIT"
+    git push https://$GITHUB_TOKEN@${REMOTE#*//} $TARGET_BRANCH

Ci/show_tree.sh

-Original file line number
+Diff line change
@@ -0,0 +1,11 @@
+    #!/bin/bash
+    shopt -s globstar
+    for rdir in $1
+    do
+        for file in $rdir/**
+        do
+          echo "$file"
+        done
+    done

LICENSE.meta

This file was deleted.

README.md

-Original file line number
+Diff line change
@@ Expand Up @@
     ## Requirements
      - Unity 2017.1 or greater.
+    ## Installation
+    - Open file `manifest.json` in `your_repo/Packages`,
+    - Under `dependencies` add following line:
+    ```json
+    "asset-bundle-manager": "https://github.com/SadPandaStudios/AssetBundleManager.git#upm",
+    ```
+    - Refresh your project in Unity,
+    - Don't forget to add this assembly `AssetBundleManager` to `Assembly Definition References` if you want to use this tool from your assembly.
     ## Recommendations
     This module pairs well with Unity's [Asset Bundle Browser](https://github.com/Unity-Technologies/AssetBundles-Browser) (ABB) tool.
@@ Expand Down @@

README.md.meta

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CI to UPM branch #19

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CI to UPM branch #19

Are you sure you want to change the base?

Uh oh!

CI to UPM branch #19

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!