From f91a9ba41eb12dd6476b60ac6beb98f35f826d09 Mon Sep 17 00:00:00 2001
From: Jonas Johan Solsvik <jonasjso@protonmail.com>
Date: Fri, 11 Sep 2020 21:26:09 +0200
Subject: [PATCH] Add integrations and submodules folders
---
.gitlab-ci.yml | 3 +--
.gitmodules | 2 +-
CMakeLists.txt | 2 +-
Makefile | 8 ++++----
{docker => integrations/dockerhub}/sfml.Dockerfile | 3 +--
.../flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml | 10 +++++-----
{external => submodules}/sfml | 0
7 files changed, 13 insertions(+), 15 deletions(-)
rename {docker => integrations/dockerhub}/sfml.Dockerfile (85%)
rename flatpak/no.ntnu.jonasjso.DoubleTrouble.Menu.yaml => integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml (64%)
rename {external => submodules}/sfml (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb8a658..087fb1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,7 @@ build-and-release:
tags:
- main
script:
- - flatpak run org.flatpak.Builder --gpg-sign=$GPG_SIGN --gpg-homedir=$GPG_HOMEDIR --repo=./build/flatpak-repo ./build/flatpak/ no.ntnu.jonasjso.DoubleTrouble.Menu.yaml;
- - mv build/flatpak-repo flatpak-repos/double-trouble
+ - flatpak run org.flatpak.Builder --gpg-sign=$GPG_SIGN --gpg-homedir=$GPG_HOMEDIR --repo=./flatpak-repos/double-trouble ./build/flatpak-build integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml;
- cd flatpak-repos
- git add double-trouble
- git commit -m "New release from CI_SERVER_NAME - $CI_SERVER_NAME, CI_PIPELINE_ID - $CI_PIPELINE_ID"
diff --git a/.gitmodules b/.gitmodules
index 0d8fe42..8e0cdb1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "external/sfml"]
- path = external/sfml
+ path = submodules/sfml
url = https://github.com/SFML/SFML
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83592a5..365bef8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(BINDIR ${CMAKE_BINARY_DIR})
# SFML
set(BUILD_SHARED_LIBS FALSE)
-add_subdirectory("./external/sfml")
+add_subdirectory("./submodules/sfml")
# make_target - Function to setup a base c++17-target linked to SFML libraries.
function(make_target target)
diff --git a/Makefile b/Makefile
index 1b6c93c..35a5c23 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ all:
dockerhub:
- docker build -f docker/sfml.Dockerfile .;
+ docker build -f integrations/dockerhub/sfml.Dockerfile .;
docker tag $$(docker images | awk '{print $$3}' | awk 'NR==2') jonasjso/sfml:latest;
docker login --username=jonasjso;
docker push jonasjso/sfml;
@@ -34,7 +34,7 @@ flatpak:
flatpak run org.flatpak.Builder\
--gpg-sign=$$GPG_SIGN\
--gpg-homedir=$$GPG_HOMEDIR\
- --repo=./build/flatpak-repo\
--force-clean\
- ./build/flatpak/\
- no.ntnu.jonasjso.DoubleTrouble.Menu.yaml;
+ --repo=./build/flatpak-repo\
+ ./build/flatpak-build\
+ integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml;
diff --git a/docker/sfml.Dockerfile b/integrations/dockerhub/sfml.Dockerfile
similarity index 85%
rename from docker/sfml.Dockerfile
rename to integrations/dockerhub/sfml.Dockerfile
index 43423a7..b7f4032 100644
--- a/docker/sfml.Dockerfile
+++ b/integrations/dockerhub/sfml.Dockerfile
@@ -1,6 +1,6 @@
FROM ubuntu:latest
-# Bring your own SFML
+# Bring your own SFML hosted at https://hub.docker.com/repository/docker/jonasjso/sfml
ENV DEBIAN_FRONTEND noninteractive
ENV CXX g++
@@ -27,4 +27,3 @@ RUN flatpak remote-add flathub https://flathub.org/repo/flathub.flatpakrepo\
org.freedesktop.Platform/x86_64/20.08\
org.freedesktop.Sdk/x86_64/20.08\
org.flatpak.Builder/x86_64/stable;
-
diff --git a/flatpak/no.ntnu.jonasjso.DoubleTrouble.Menu.yaml b/integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml
similarity index 64%
rename from flatpak/no.ntnu.jonasjso.DoubleTrouble.Menu.yaml
rename to integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml
index 5e0a09b..1455671 100644
--- a/flatpak/no.ntnu.jonasjso.DoubleTrouble.Menu.yaml
+++ b/integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml
@@ -1,8 +1,8 @@
-app-id: no.ntnu.jonasjso.DoubleTrouble.Menu
+app-id: no.ntnu.jonasjso.doubleTrouble.Menu
runtime: org.freedesktop.Platform
runtime-version: '20.08'
sdk: org.freedesktop.Sdk
-command: Menu
+command: no.ntnu.jonasjso.doubleTrouble.Menu
finish-args:
- --share=ipc
- --socket=x11
@@ -17,8 +17,8 @@ modules:
- mkdir build/
- cmake -S . -B build/
- make -C build/
- - install -D ./build/03-menu /app/bin/Menu
+ - install -D ./build/03-menu /app/bin/no.ntnu.jonasjso.doubleTrouble.Menu
sources:
- - type: dir
- path: .
+ - type: git
+ path: ../../
diff --git a/external/sfml b/submodules/sfml
similarity index 100%
rename from external/sfml
rename to submodules/sfml
--
GitLab