From ff6f82a0126d9f6569bcff1baad86c81b2be5a60 Mon Sep 17 00:00:00 2001
From: Miguel Castiblanco <miguel@starcarr.co>
Date: Sat, 23 Jun 2018 22:04:32 -0700
Subject: [PATCH 1/2] [CICD] Updated build generation. All branches will create
an artifact, only will last longer than 24 hours
---
.gitlab-ci.yml | 47 +++++++++++++++--------------------------------
build.sh | 17 +++++++++++++++++
2 files changed, 32 insertions(+), 32 deletions(-)
create mode 100644 build.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d97a118..943cd1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,47 +1,30 @@
-image: starcarr/libnx:latest
-
variables:
PACKAGE_FOLDER: "beetle-vb"
- LIBRARY_NAME: "mednafen_vb_libretro_switch.a"
- NRO_NAME: "beetle-virtualboy.nro"
- APP_TITLE: "Beetle-VirtualBoy libnx"
-
-cache:
- key: ${CI_COMMIT_REF_SLUG}
- paths:
- - $PACKAGE_FOLDER
stages:
- - build
- package
-build:
- stage: build
- script:
- - rm -rf $PACKAGE_FOLDER
- - mkdir $PACKAGE_FOLDER
- - cp assets/overlay.cfg $PACKAGE_FOLDER/overlay.cfg
- - cp assets/overlay.png $PACKAGE_FOLDER/overlay.png
- - make platform=switch -j20
- - git clone -b master https://git.m4xw.net/Switch/RetroArch/RetroArch.git --depth=1
- - cp $LIBRARY_NAME RetroArch/libretro_switch.a
- - cp assets/icon.jpg RetroArch/icon.jpg
- - cd RetroArch/
- - mkdir romfs
- - APP_TITLE="$APP_TITLE" make -f Makefile.switch -j20
- - cp retroarch_switch.nro ../$PACKAGE_FOLDER/$NRO_NAME
- - cp retroarch.cfg ../$PACKAGE_FOLDER/retroarch.cfg
-
package:
stage: package
+ image: starcarr/libnx:latest
script:
- - echo 'creating zip'
- when: on_success
+ - sh build.sh $PACKAGE_FOLDER master
artifacts:
name: $PACKAGE_FOLDER
paths:
- $PACKAGE_FOLDER
only:
- - master
-
+ - master
+nightly:
+ stage: package
+ image: starcarr/libnx:nightly
+ script:
+ - sh build.sh $PACKAGE_FOLDER develop
+ artifacts:
+ name: $PACKAGE_FOLDER
+ expire_in: 24 hours
+ paths:
+ - $PACKAGE_FOLDER
+ except:
+ - master
diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..bdf5090
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,17 @@
+PACKAGE_FOLDER=$1
+BRANCH=$2
+LIBRARY_NAME="mednafen_vb_libretro_switch.a"
+NRO_NAME="beetle-virtualboy.nro"
+APP_TITLE="Beetle-VirtualBoy libnx"
+
+mkdir $PACKAGE_FOLDER
+cp assets/overlay.cfg $PACKAGE_FOLDER/overlay.cfg
+cp assets/overlay.png $PACKAGE_FOLDER/overlay.png
+make platform=switch -j10
+git clone -b master https://git.m4xw.net/Switch/RetroArch/RetroArch.git --depth=1
+cp $LIBRARY_NAME RetroArch/libretro_switch.a
+cp assets/icon.jpg RetroArch/icon.jpg
+cd RetroArch/
+mkdir romfs
+APP_TITLE="$APP_TITLE" make -f Makefile.switch -j10
+cp retroarch_switch.nro ../$PACKAGE_FOLDER/$NRO_NAME
--
GitLab
From 116ba0b491ec270aa2d85fa8291606b8bc319360 Mon Sep 17 00:00:00 2001
From: Starcarr <miguel@starcarr.co>
Date: Wed, 27 Jun 2018 07:02:56 +0200
Subject: [PATCH 2/2] Update build.sh
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index bdf5090..bde6457 100644
--- a/build.sh
+++ b/build.sh
@@ -8,7 +8,7 @@ mkdir $PACKAGE_FOLDER
cp assets/overlay.cfg $PACKAGE_FOLDER/overlay.cfg
cp assets/overlay.png $PACKAGE_FOLDER/overlay.png
make platform=switch -j10
-git clone -b master https://git.m4xw.net/Switch/RetroArch/RetroArch.git --depth=1
+git clone -b $BRANCH https://git.m4xw.net/Switch/RetroArch/RetroArch.git --depth=1
cp $LIBRARY_NAME RetroArch/libretro_switch.a
cp assets/icon.jpg RetroArch/icon.jpg
cd RetroArch/
--
GitLab