Compile translations before build

gaphor · Feb 15, 2020 · ace8b4c · ace8b4c
1 parent 993f553
commit ace8b4c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -76,8 +76,7 @@ jobs:
           coverageCommand: coverage xml
       - name: Build
         run: |
-          make translate
-          poetry build
+          make dist
       - name: Upload gaphor-${{ steps.meta.outputs.version }}.tar.gz
         uses: actions/upload-artifact@v1
         if: matrix.py_ver == '3.7'
@@ -186,7 +185,7 @@ jobs:
         run: pytest
       - name: Create macOS Application
         run: |
-          poetry build
+          make dist
           cd macos-dmg
           ./package.sh
           mkdir artifact

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ help:		## Show this help
 	@echo "make <target>, where <target> is one of:"
 	@grep -hP "\t##" $(MAKEFILE_LIST) | sed -e 's/^\([a-z]*\):.*## /  \1\t/' | expand -t14
 
-dist: icons translate	## Build application distribution (requires Poetry)
+dist: translate	## Build application distribution (requires Poetry)
 	poetry build
 
 docs:		## Generate documentation (requirss Sphinx)

diff --git a/win-installer/msys2-install.sh b/win-installer/msys2-install.sh
@@ -8,6 +8,7 @@ pacman --noconfirm -Suy
 
 pacman --noconfirm -S --needed \
     git \
+    make \
     mingw-w64-$MSYS2_ARCH-gcc \
     mingw-w64-$MSYS2_ARCH-gtk3 \
     mingw-w64-$MSYS2_ARCH-pkg-config \
@@ -22,3 +23,4 @@ pacman --noconfirm -S --needed \
 pip install poetry==1.0.3
 poetry config virtualenvs.create false
 poetry install
+make translate