From e7f55a037539417d9d522939c84d3b1754239ff6 Mon Sep 17 00:00:00 2001
From: Hannes Kuchelmeister <hannes@kuchelmeister.org>
Date: Sun, 7 Aug 2022 13:07:02 +0200
Subject: [PATCH] renamed ci file

---
 .github/workflows/build_and_publish.yml                       | 2 +-
 .github/workflows/{ci_tests.yml => ci.yml}                    | 3 +--
 Containerfile => containers/Containerfile                     | 0
 docker-compose.test.yml => containers/docker-compose.test.yml | 4 ++--
 docker-compose.yml => containers/docker-compose.yml           | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename .github/workflows/{ci_tests.yml => ci.yml} (92%)
 rename Containerfile => containers/Containerfile (100%)
 rename docker-compose.test.yml => containers/docker-compose.test.yml (86%)
 rename docker-compose.yml => containers/docker-compose.yml (88%)

diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml
index b0cec86..edfc5cf 100644
--- a/.github/workflows/build_and_publish.yml
+++ b/.github/workflows/build_and_publish.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Build
-      run: docker-compose up
+      run: docker-compose -f containers/docker-compose.yml up
     - name: Show dir
       run: ls
     - name: Upload Artifact
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci.yml
similarity index 92%
rename from .github/workflows/ci_tests.yml
rename to .github/workflows/ci.yml
index f19a2bf..9644cf4 100644
--- a/.github/workflows/ci_tests.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,6 @@ jobs:
     - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
       with:
         bundle: toolbxtuner.flatpak
-        manifest-path: org.kuchelmeister.toolbxtuner.dev.json
+        manifest-path: build-aux/org.kuchelmeister.ToolbxTuner.Devel.json
         run-tests: true
         cache-key: flatpak-builder-${{ github.sha }}
-
diff --git a/Containerfile b/containers/Containerfile
similarity index 100%
rename from Containerfile
rename to containers/Containerfile
diff --git a/docker-compose.test.yml b/containers/docker-compose.test.yml
similarity index 86%
rename from docker-compose.test.yml
rename to containers/docker-compose.test.yml
index f48a7c0..fabdb76 100644
--- a/docker-compose.test.yml
+++ b/containers/docker-compose.test.yml
@@ -4,7 +4,7 @@ services:
     build: .
     privileged: true
     volumes:
-      - .:/mnt:z
+      - ..:/mnt:z
     security_opt:
       - label=disable
- 
\ No newline at end of file
+ 
diff --git a/docker-compose.yml b/containers/docker-compose.yml
similarity index 88%
rename from docker-compose.yml
rename to containers/docker-compose.yml
index df7f8ee..82694e5 100644
--- a/docker-compose.yml
+++ b/containers/docker-compose.yml
@@ -3,6 +3,6 @@ services:
   gtk4-rs:
     image: ghcr.io/13hannes11/gtk4-rs-docker:latest-appimage
     volumes:
-      - .:/mnt:z
+      - ..:/mnt:z
     command: sh -c "cargo appimage"