fix(ci): Use common tag on all OS-es, don't rebuild in pkger

vv9k · Oct 21, 2022 · 14ee92e · 14ee92e
1 parent 8674a9a
commit 14ee92e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 33 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,5 +1,3 @@
-#name: release
-
 on:
   push:
     branches:
@@ -40,7 +38,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        build: [linux, windows-msvc]
         include:
         - build: linux
           os: ubuntu-latest
@@ -56,14 +53,18 @@ jobs:
       - name: Set up Rust
         uses: hecrj/setup-rust-action@v1
       - uses: actions/checkout@v3
-      - name: Set version
+      - name: Set version Unix
+        run: echo "EPICK_VERSION=$GITHUB_REF_NAME" >> $GITHUB_ENV
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
+      - name: Set archive name Unix
+        run: echo "EPICK_ARCHIVE=epick-${{ env.EPICK_VERSION }}-${{ matrix.target }}" >> $GITHUB_ENV
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
-        run: echo "EPICK_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-      - name: Set version
+      - name: Set version Windows
+        run: echo "EPICK_VERSION=$env:GITHUB_REF_NAME" >> $env:GITHUB_ENV
+        if: matrix.os == 'windows-latest'
+      - name: Set archive name Windows
+        run: echo "EPICK_ARCHIVE=epick-$env:EPICK_VERSION-${{ matrix.target }}" >> $env:GITHUB_ENV
         if: matrix.os == 'windows-latest'
-        run: echo "EPICK_VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
-      - name: Set archive name
-        run: echo "EPICK_ARCHIVE=epick-${{ env.EPICK_VERSION}}-${{ matrix.target}}" >> $GITHUB_ENV
       - name: Install dependencies
         if: matrix.os == 'ubuntu-latest'
         run: sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev
@@ -125,11 +126,16 @@ jobs:
       - name: Install pkger
         if: matrix.os == 'ubuntu-latest'
         run: |
-          curl -LO https://github.com/vv9k/pkger/releases/download/0.8.0/pkger-0.8.0-0.amd64.deb
-          sudo dpkg -i pkger-0.8.0-0.amd64.deb
+          curl -LO https://github.com/vv9k/pkger/releases/download/0.10.0/pkger-0.10.0-0.amd64.deb
+          sudo dpkg -i pkger-0.10.0-0.amd64.deb
           /usr/bin/pkger init
           mkdir -p $HOME/.config/pkger/recipes/epick
           cp pkger.yml $HOME/.config/pkger/recipes/epick/recipe.yaml
+      - name: Copy prebuilt archive
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          cp ${{ env.EPICK_ARCHIVE }}.tar.gz $HOME/.config/pkger/recipes/epick/
+          tar zcvf $HOME/.config/pkger/recipes/epick/assets.tar.gz assets
       - name: Build RPM and DEB
         if: matrix.os == 'ubuntu-latest'
         run: /usr/bin/pkger build -s deb -s rpm -- epick

diff --git a/pkger.yml b/pkger.yml
@@ -5,23 +5,12 @@ metadata:
   version: 0.9.0
   description: Color picker for creating harmonic color palettes
   license: GPL-3.0
-  source: https://github.com/vv9k/$RECIPE/archive/refs/tags/$RECIPE_VERSION.tar.gz
-  build_depends:
-    pkger-deb: ['libxcb-render0-dev', 'libxcb-shape0-dev', 'libxcb-xfixes0-dev', 'libxkbcommon-dev']
-    pkger-rpm: ['libxcb-devel', 'libxkbcommon-devel', 'libxcb']
-    all:
-      - curl
-      - gcc
-      - pkg-config
-      - python3
-configure:
-  steps:
-    - cmd: curl -o /tmp/install_rust.sh https://sh.rustup.rs
-    - cmd: sh /tmp/install_rust.sh -y --default-toolchain stable
+  all_images: true
+  source:
+    - epick-0.9.0-x86_64-unknown-linux.tar.gz
+    - assets.tar.gz
 build:
-  working_dir: $PKGER_BLD_DIR/${RECIPE}-$RECIPE_VERSION
-  steps:
-    - cmd: $HOME/.cargo/bin/cargo build --release
+  steps: []
 install:
   steps:
     - cmd: >-
@@ -32,9 +21,9 @@ install:
           usr/share/icons/hicolor/48x48/apps \
           usr/share/icons/hicolor/scalable/apps \
           usr/share/applications
-    - cmd: install -m755 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/target/release/$RECIPE usr/bin/
-    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/LICENSE usr/share/licenses/$RECIPE/LICENSE
-    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/README.md usr/share/doc/$RECIPE/README.md
-    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/assets/icon.png usr/share/icons/hicolor/48x48/apps/$RECIPE.png
-    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/assets/icon.svg usr/share/icons/hicolor/scalable/apps/$RECIPE.svg
-    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/assets/$RECIPE.desktop usr/share/applications/$RECIPE.desktop
+    - cmd: install -m755 $PKGER_BLD_DIR/$RECIPE/$RECIPE usr/bin/
+    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE/LICENSE usr/share/licenses/$RECIPE/LICENSE
+    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE/README.md usr/share/doc/$RECIPE/README.md
+    - cmd: install -m644 $PKGER_BLD_DIR/assets/icon.png usr/share/icons/hicolor/48x48/apps/$RECIPE.png
+    - cmd: install -m644 $PKGER_BLD_DIR/assets/icon.svg usr/share/icons/hicolor/scalable/apps/$RECIPE.svg
+    - cmd: install -m644 $PKGER_BLD_DIR/assets/$RECIPE.desktop usr/share/applications/$RECIPE.desktop