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.

Sign up for GitHub

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

Master to Dev #87

Merged
merged 19 commits into from
Oct 6, 2023
Merged

Master to Dev #87

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
76e66a1
Tweaks for 2.7.3 release
alexmpa Apr 27, 2022
cd0b59a
Update getpeers links for Phantasma
alexmpa May 22, 2022
b0ee359
Fix condition from previous commit
alexmpa May 22, 2022
9843370
Rewrite condition from previous commit
alexmpa May 22, 2022
85fe09a
Bump version to 2.7.4
alexmpa May 22, 2022
3829620
Final links for peers
alexmpa May 23, 2022
50b9cc9
Added iOS logo
Relfos May 28, 2022
c82128f
Merge remote-tracking branch 'origin/master'
Relfos May 28, 2022
d1336f9
More iOS icon settings
Relfos May 28, 2022
d26a8f2
Merge branch 'ng'
Relfos Nov 30, 2022
a71f3eb
Merge branch 'development'
Relfos Dec 20, 2022
c5b126c
Merge pull request #69 from phantasma-io/development
TeknoPT Jan 3, 2023
3a0b7bb
Merge pull request #71 from phantasma-io/development
TeknoPT Jan 10, 2023
a96684f
Merge pull request #75 from phantasma-io/development
Relfos Apr 6, 2023
956f3b1
Merge pull request #80 from phantasma-io/development
TeknoPT May 5, 2023
641f244
Merge pull request #82 from phantasma-io/development
TeknoPT Oct 4, 2023
2768ab5
Remove the actions
TeknoPT Oct 4, 2023
465d199
Merge pull request #84 from phantasma-io/development
TeknoPT Oct 4, 2023
264ec23
Merge pull request #86 from phantasma-io/development
TeknoPT Oct 6, 2023
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
258 changes: 129 additions & 129 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,137 +1,137 @@
name: Actions 😎
#name: Actions 😎
#
#on: [push, pull_request]

on: [push, pull_request]
#jobs:
# buildAndTestForLinuxBasedPlatforms:
# name: Build for ${{ matrix.targetPlatform }}
# runs-on: ubuntu-latest
# strategy:
# fail-fast: false
# matrix:
# projectPath:
# - test-project
# unityVersion:
# - 2021.3.15f
# targetPlatform:
# - StandaloneLinux64 # Build a Linux 64-bit standalone.
# - iOS # Build an iOS player.
# - Android # Build an Android player.
# steps:
# - uses: actions/checkout@v3
# with:
# fetch-depth: 0
# lfs: true
# - uses: actions/cache@v2
# with:
# path: ${{ matrix.projectPath }}/Library
# key:
# Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-${{
# hashFiles(matrix.projectPath) }}
# restore-keys: |
# Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-
# Library-${{ matrix.projectPath }}-
# Library-
# - uses: game-ci/unity-builder@v2
# env:
# UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
# UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
# UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
# with:
# projectPath: ${{ matrix.projectPath }}
# unityVersion: ${{ matrix.unityVersion }}
# targetPlatform: ${{ matrix.targetPlatform }}
# customParameters: '-myParameter myValue -myBoolean -ThirdParameter andItsValue'
# - uses: actions/upload-artifact@v2
# with:
# name: Build
# path: build

jobs:
buildAndTestForLinuxBasedPlatforms:
name: Build for ${{ matrix.targetPlatform }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
projectPath:
- test-project
unityVersion:
- 2021.3.15f1
targetPlatform:
- StandaloneLinux64 # Build a Linux 64-bit standalone.
- iOS # Build an iOS player.
- Android # Build an Android player.
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
lfs: true
- uses: actions/cache@v2
with:
path: ${{ matrix.projectPath }}/Library
key:
Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-${{
hashFiles(matrix.projectPath) }}
restore-keys: |
Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-
Library-${{ matrix.projectPath }}-
Library-
- uses: game-ci/unity-builder@v2
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
with:
projectPath: ${{ matrix.projectPath }}
unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }}
customParameters: '-myParameter myValue -myBoolean -ThirdParameter andItsValue'
- uses: actions/upload-artifact@v2
with:
name: Build
path: build
# buildForWindowsBasedPlatforms:
# name: Build for ${{ matrix.targetPlatform }}
# runs-on: windows-2019
# strategy:
# fail-fast: false
# matrix:
# projectPath:
# - test-project
# unityVersion:
# - 2021.3.15f1
# targetPlatform:
# - StandaloneWindows64 # Build a Windows 64-bit standalone.

buildForWindowsBasedPlatforms:
name: Build for ${{ matrix.targetPlatform }}
runs-on: windows-2019
strategy:
fail-fast: false
matrix:
projectPath:
- test-project
unityVersion:
- 2021.3.15f1
targetPlatform:
- StandaloneWindows64 # Build a Windows 64-bit standalone.
# steps:
# - uses: actions/checkout@v3
# with:
# fetch-depth: 0
# lfs: true
# - uses: actions/cache@v2
# with:
# path: ${{ matrix.projectPath }}/Library
# key:
# Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-${{
# hashFiles(matrix.projectPath) }}
# restore-keys: |
# Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-
# Library-${{ matrix.projectPath }}-
# Library-
# - uses: game-ci/unity-builder@v2
# env:
# UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
# UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
# UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
# with:
# projectPath: ${{ matrix.projectPath }}
# unityVersion: ${{ matrix.unityVersion }}
# targetPlatform: ${{ matrix.targetPlatform }}
# customParameters: '-myParameter myValue -myBoolean -ThirdParameter andItsValue'
# - uses: actions/upload-artifact@v2
# with:
# name: Build
# path: build

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
lfs: true
- uses: actions/cache@v2
with:
path: ${{ matrix.projectPath }}/Library
key:
Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-${{
hashFiles(matrix.projectPath) }}
restore-keys: |
Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-
Library-${{ matrix.projectPath }}-
Library-
- uses: game-ci/unity-builder@v2
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
with:
projectPath: ${{ matrix.projectPath }}
unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }}
customParameters: '-myParameter myValue -myBoolean -ThirdParameter andItsValue'
- uses: actions/upload-artifact@v2
with:
name: Build
path: build
# buildForMacOSBasedPlatforms:
# name: Build for ${{ matrix.targetPlatform }}
# runs-on: macos-latest
# strategy:
# fail-fast: false
# matrix:
# projectPath:
# - test-project
# unityVersion:
# - 2021.3.15f1
# targetPlatform:
# - StandaloneOSX # Build a macOS standalone.

buildForMacOSBasedPlatforms:
name: Build for ${{ matrix.targetPlatform }}
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
projectPath:
- test-project
unityVersion:
- 2021.3.15f1
targetPlatform:
- StandaloneOSX # Build a macOS standalone.
# steps:
# - uses: actions/checkout@v3
# with:
# fetch-depth: 0
# lfs: true

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
lfs: true
# - uses: actions/cache@v2
# with:
# path: ${{ matrix.projectPath }}/Library
# key:
# Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-${{
# hashFiles(matrix.projectPath) }}
# restore-keys: |
# Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-
# Library-${{ matrix.projectPath }}-
# Library-

- uses: actions/cache@v2
with:
path: ${{ matrix.projectPath }}/Library
key:
Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-${{
hashFiles(matrix.projectPath) }}
restore-keys: |
Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}-
Library-${{ matrix.projectPath }}-
Library-
# - uses: game-ci/unity-builder@v2
# env:
# UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
# UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
# UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
# with:
# projectPath: ${{ matrix.projectPath }}
# unityVersion: ${{ matrix.unityVersion }}
# targetPlatform: ${{ matrix.targetPlatform }}
# customParameters: '-myParameter myValue -myBoolean -ThirdParameter andItsValue'

- uses: game-ci/unity-builder@v2
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
with:
projectPath: ${{ matrix.projectPath }}
unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }}
customParameters: '-myParameter myValue -myBoolean -ThirdParameter andItsValue'

- uses: actions/upload-artifact@v2
with:
name: Build
path: build
# - uses: actions/upload-artifact@v2
# with:
# name: Build
# path: build