diff --git a/.ci/docker.sh b/.ci/docker.sh new file mode 100755 index 000000000..75c4fe024 --- /dev/null +++ b/.ci/docker.sh @@ -0,0 +1,4 @@ +mkdir build + +docker build -f docker/azahar-room/Dockerfile -t azahar-room . +docker save azahar-room:latest > build/azahar-room.dockerimage \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d02dd2f0..cb0d4c993 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,7 @@ jobs: with: name: source path: artifacts/ + linux: runs-on: ubuntu-latest strategy: @@ -61,6 +62,7 @@ jobs: with: name: ${{ env.OS }}-${{ env.TARGET }} path: artifacts/ + macos: runs-on: ${{ (matrix.target == 'x86_64' && 'macos-15-intel') || 'macos-26' }} strategy: @@ -102,6 +104,7 @@ jobs: with: name: ${{ env.OS }}-${{ env.TARGET }} path: artifacts/ + macos-universal: runs-on: macos-26 needs: macos @@ -133,6 +136,7 @@ jobs: with: name: ${{ env.OS }}-${{ env.TARGET }} path: artifacts/ + windows: runs-on: windows-latest strategy: @@ -210,6 +214,7 @@ jobs: with: name: ${{ env.OS }}-${{ env.TARGET }} path: artifacts/ + android: runs-on: ubuntu-latest env: @@ -261,3 +266,23 @@ jobs: with: name: ${{ env.OS }}-${{ env.TARGET }} path: src/android/app/artifacts/ + + docker: + runs-on: ubuntu-latest + container: + image: docker:dind + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - name: Build Docker image + run: ./.ci/docker.sh + - name: Move Docker image to artifacts directory + run: | + mkdir -p artifacts + mv build/*.dockerimage artifacts/ + - name: Upload + uses: actions/upload-artifact@v4 + with: + name: docker + path: artifacts/ \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3651c93be..6000a682d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ src/installer/*.exe src/common/scm_rev.cpp .travis.descriptor.json +# Docker image files +*.dockerimage + # Project/editor files *.swp *.kdev4