fix: architecture conflict (#152)

* fix: architecture conflict

fix: download

* fix: add paths

fix

* fix: add suffix

* chore: add pull request

* fix run sh

* fix: wrong arg

* fix equal check

Author: leavesster

.github/actions/download/action.yml

@@ -44,12 +44,12 @@ runs:
     - name: download oocana
       run: |
         if [ "${{ inputs.architecture }}" = "amd64" ]; then
-          gh release download ${{ inputs.oocana }} --repo oomol/oocana-rust --pattern "oocana-cli-x86_64-unknown-linux-gnu.tar.gz" -O oocana-cli.tar.gz
-          tar -xf oocana-cli.tar.gz -C /tmp
+          gh release download ${{ inputs.oocana }} --repo oomol/oocana-rust --pattern "oocana-cli-x86_64-unknown-linux-gnu.tar.gz" --clobber -O oocana-cli-${{inputs.architecture}}.tar.gz
+          tar -xf oocana-cli-${{inputs.architecture}}.tar.gz -C /tmp
           mv /tmp/oocana-cli-x86_64-unknown-linux-gnu $(pwd)/${{inputs.architecture}}/oocana
         elif [ "${{ inputs.architecture }}" = "arm64" ]; then
-          gh release download ${{ inputs.oocana }} --repo oomol/oocana-rust --pattern "oocana-cli-aarch64-unknown-linux-gnu.tar.gz" -O oocana-cli.tar.gz
-          tar -xf oocana-cli.tar.gz -C /tmp
+          gh release download ${{ inputs.oocana }} --repo oomol/oocana-rust --pattern "oocana-cli-aarch64-unknown-linux-gnu.tar.gz" --clobber -O oocana-cli-${{inputs.architecture}}.tar.gz
+          tar -xf oocana-cli-${{inputs.architecture}}.tar.gz -C /tmp
           mv /tmp/oocana-cli-aarch64-unknown-linux-gnu $(pwd)/${{inputs.architecture}}/oocana
         fi
       shell: bash
@@ -59,9 +59,9 @@ runs:
     - name: download ovmlayer
       run: |
         if [ "${{ inputs.architecture }}" = "amd64" ]; then
-          gh release download ${{ inputs.ovmlayer }} --repo oomol/ovmlayer-rootfs --pattern "ovmlayer_amd64.tar.zst" -O ovmlayer.tar.zst
+          gh release download ${{ inputs.ovmlayer }} --repo oomol/ovmlayer-rootfs --pattern "ovmlayer_amd64.tar.zst" --clobber -O ovmlayer-${{inputs.architecture}}.tar.zst
         elif [ "${{ inputs.architecture }}" = "arm64" ]; then
-          gh release download ${{ inputs.ovmlayer }} --repo oomol/ovmlayer-rootfs --pattern "ovmlayer_arm64.tar.zst" -O ovmlayer.tar.zst
+          gh release download ${{ inputs.ovmlayer }} --repo oomol/ovmlayer-rootfs --pattern "ovmlayer_arm64.tar.zst" --clobber -O ovmlayer-${{inputs.architecture}}.tar.zst
         fi
       shell: bash
       env:
@@ -70,8 +70,8 @@ runs:
     - name: extract ovmlayer
       run: |
         mkdir -p /tmp/ovmlayer
-        zstd -d ovmlayer.tar.zst -o /tmp/ovmlayer.tar
-        tar -xf /tmp/ovmlayer.tar -C $(pwd)/${{inputs.architecture}}
+        zstd -d ovmlayer-${{inputs.architecture}}.tar.zst -o /tmp/ovmlayer-${{inputs.architecture}}.tar
+        tar -xf /tmp/ovmlayer-${{inputs.architecture}}.tar -C $(pwd)/${{inputs.architecture}}
       shell: bash
 
     - name: download rootfs

.github/workflows/build-studio-image.yaml

@@ -1,10 +1,18 @@
 name: build studio image
 on:
+  pull_request:
+    paths:
+      - "studio.dockerfile"
+      - "package.json"
+      - "package-lock.json"
+      - ".github/actions/ovmlayer/action.yml"
+      - ".github/workflows/build-studio-image.yaml"
   push:
     paths:
       - "studio.dockerfile"
       - "package.json"
       - "package-lock.json"
+      - ".github/actions/ovmlayer/action.yml"
       - ".github/workflows/build-studio-image.yaml"
   workflow_dispatch:
 

scripts/bin.sh

@@ -1,16 +1,17 @@
+#!/usr/bin/env bash
 set -x
-echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /1.log
-if TARGETPLATFORM == "linux/amd64"; then
-  echo "Downloading amd64 oocana and ovmlayer" >> /1.log
+echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /tmp/1.log
+if [ "$TARGETPLATFORM" == "linux/amd64" ]; then
+  echo "Downloading amd64 oocana and ovmlayer" >> /tmp/1.log
   cp -r ./amd64/oocana /app/
   cp -r ./amd64/ovmlayer /app/
   cp ./amd64/rootfs.tar /root/rootfs.tar
-elif TARGETPLATFORM == "linux/arm64"; then
-  echo "Downloading arm64 oocana and ovmlayer" >> /1.log
+elif [ "$TARGETPLATFORM" == "linux/arm64" ]; then
+  echo "Downloading arm64 oocana and ovmlayer" >> /tmp/1.log
   cp -r ./arm64/oocana /app/
   cp -r ./arm64/ovmlayer /app/
   cp ./arm64/rootfs.tar /root/rootfs.tar
 else
-  echo "Unsupported platform: $TARGETPLATFORM" >> /1.log
-  exit 1
+  echo "Unsupported platform: $TARGETPLATFORM" >> /tmp/1.log
+  exit 23
 fi

studio.dockerfile

@@ -2,6 +2,9 @@
 # https://github.com/docker/docs/issues/20935
 FROM ghcr.io/oomol/server-base:v0.4.1
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
 # npm config get cache
 ENV NPM_CACHE=$HOME/.npm
 WORKDIR /app
@@ -22,7 +25,7 @@ RUN mkdir -p /opt/ovmlayer
 COPY ./entrypoint.sh /root/entrypoint.sh
 COPY ./amd64 ./amd64
 COPY ./arm64 ./arm64
-COPY ./scripts/bin.sh /bin.sh
-RUN ./bin.sh
+COPY ./scripts/bin.sh /root/bin.sh
+RUN TARGETPLATFORM=$TARGETPLATFORM BUILDPLATFORM=$BUILDPLATFORM /root/bin.sh
 RUN rm -rf ./amd64 ./arm64
 ENTRYPOINT [ "bash", "-x", "/root/entrypoint.sh" ]