Skip to content
Snippets Groups Projects
Verified Commit f91a9ba4 authored by Jonas Johan Solsvik's avatar Jonas Johan Solsvik :video_game:
Browse files

Add integrations and submodules folders

parent b9bca5ef
No related branches found
No related tags found
No related merge requests found
...@@ -17,8 +17,7 @@ build-and-release: ...@@ -17,8 +17,7 @@ build-and-release:
tags: tags:
- main - main
script: 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; - 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;
- mv build/flatpak-repo flatpak-repos/double-trouble
- cd flatpak-repos - cd flatpak-repos
- git add double-trouble - git add double-trouble
- git commit -m "New release from CI_SERVER_NAME - $CI_SERVER_NAME, CI_PIPELINE_ID - $CI_PIPELINE_ID" - git commit -m "New release from CI_SERVER_NAME - $CI_SERVER_NAME, CI_PIPELINE_ID - $CI_PIPELINE_ID"
......
[submodule "external/sfml"] [submodule "external/sfml"]
path = external/sfml path = submodules/sfml
url = https://github.com/SFML/SFML url = https://github.com/SFML/SFML
...@@ -6,7 +6,7 @@ set(BINDIR ${CMAKE_BINARY_DIR}) ...@@ -6,7 +6,7 @@ set(BINDIR ${CMAKE_BINARY_DIR})
# SFML # SFML
set(BUILD_SHARED_LIBS FALSE) 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. # make_target - Function to setup a base c++17-target linked to SFML libraries.
function(make_target target) function(make_target target)
......
...@@ -25,7 +25,7 @@ all: ...@@ -25,7 +25,7 @@ all:
dockerhub: 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 tag $$(docker images | awk '{print $$3}' | awk 'NR==2') jonasjso/sfml:latest;
docker login --username=jonasjso; docker login --username=jonasjso;
docker push jonasjso/sfml; docker push jonasjso/sfml;
...@@ -34,7 +34,7 @@ flatpak: ...@@ -34,7 +34,7 @@ flatpak:
flatpak run org.flatpak.Builder\ flatpak run org.flatpak.Builder\
--gpg-sign=$$GPG_SIGN\ --gpg-sign=$$GPG_SIGN\
--gpg-homedir=$$GPG_HOMEDIR\ --gpg-homedir=$$GPG_HOMEDIR\
--repo=./build/flatpak-repo\
--force-clean\ --force-clean\
./build/flatpak/\ --repo=./build/flatpak-repo\
no.ntnu.jonasjso.DoubleTrouble.Menu.yaml; ./build/flatpak-build\
integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml;
FROM ubuntu:latest 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 DEBIAN_FRONTEND noninteractive
ENV CXX g++ ENV CXX g++
...@@ -27,4 +27,3 @@ RUN flatpak remote-add flathub https://flathub.org/repo/flathub.flatpakrepo\ ...@@ -27,4 +27,3 @@ RUN flatpak remote-add flathub https://flathub.org/repo/flathub.flatpakrepo\
org.freedesktop.Platform/x86_64/20.08\ org.freedesktop.Platform/x86_64/20.08\
org.freedesktop.Sdk/x86_64/20.08\ org.freedesktop.Sdk/x86_64/20.08\
org.flatpak.Builder/x86_64/stable; org.flatpak.Builder/x86_64/stable;
app-id: no.ntnu.jonasjso.DoubleTrouble.Menu app-id: no.ntnu.jonasjso.doubleTrouble.Menu
runtime: org.freedesktop.Platform runtime: org.freedesktop.Platform
runtime-version: '20.08' runtime-version: '20.08'
sdk: org.freedesktop.Sdk sdk: org.freedesktop.Sdk
command: Menu command: no.ntnu.jonasjso.doubleTrouble.Menu
finish-args: finish-args:
- --share=ipc - --share=ipc
- --socket=x11 - --socket=x11
...@@ -17,8 +17,8 @@ modules: ...@@ -17,8 +17,8 @@ modules:
- mkdir build/ - mkdir build/
- cmake -S . -B build/ - cmake -S . -B build/
- make -C 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: sources:
- type: dir - type: git
path: . path: ../../
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment