Move everything to single dir

youtube · Jul 13, 2024 · 53633db · 53633db
1 parent 090279e
commit 53633db
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -1,4 +1,4 @@
-name: Docker Build
+name: Android build
 
 on:
   pull_request:
@@ -71,9 +71,9 @@ jobs:
       - name: Generate gclient file
         run: gclient config --name=src https://github.com/${{ github.repository }}
       - name: Set target OS
+        # echo "target_os_only=True" >> .gclient
         run: |
           echo "target_os=['android']" >> .gclient
-          echo "target_os_only=True" >> .gclient
           gclient validate
       - name: Gclient sync
         run: gclient sync -v --shallow --no-history -r ${{ github.sha }}

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -1,4 +1,4 @@
-name: Docker Build
+name: Linux Build
 
 # test
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,6 @@ files: |
         (
             .github|
             chrobalt|
-            docker|
         )
     )
 

diff --git a/docker/linux/Dockerfile → chrobalt/docker/linux/Dockerfile b/docker/linux/Dockerfile → chrobalt/docker/linux/Dockerfile
diff --git a/docker/linux/files/sccache → chrobalt/docker/linux/files/sccache b/docker/linux/files/sccache → chrobalt/docker/linux/files/sccache
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
   app:
     build:
-      context: docker/linux
+      context: chrobalt/docker/linux
       cache_from:
         - ghcr.io/youtube/chrobalt_sandbox/linux:latest
     image: ghcr.io/youtube/chrobalt_sandbox/linux:latest