Fix other typo. Shorten experiment in arm build.

OpenSmalltalk · Jul 29, 2021 · c8c2ce4 · c8c2ce4
1 parent ec497f4
commit c8c2ce4
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 45 deletions.
diff --git a/.github/workflows/linux-arm.yml b/.github/workflows/linux-arm.yml
@@ -73,61 +73,69 @@ jobs:
         with: 
           arch: ${{ env.ARCH_ARM }}
           distro: buster
-
+          env: |
+            GITHUB_ENV: $GITHUB_ENV
+          run: |
+            echo "Running!"
+            printenv
+            echo "FOOBAR=42" >> $GITHUB_ENV
           # dockerRunArgs: |
           #   --volume "${PWD}:/checkout"
 
-          install: |
-            echo "Installing stuff into the container!"
-            apt update
-            apt install build-essential git devscripts
-            apt install uuid-dev libcairo2-dev libpango1.0-dev libgl1-mesa-dev 
-            apt install libgl1-mesa-glx libssl-dev libevdev-dev m4 libpulse-dev
-            apt install libasound2-dev libfreetype6-dev libx11-dev libxrender-dev
-            apt install libtool automake autoconf libltdl-dev
+      - name: Test var
+        run: echo "${{ FOOBAR }}"
+
+          # install: |
+          #   echo "Installing stuff into the container!"
+          #   apt update
+          #   apt install build-essential git devscripts
+          #   apt install uuid-dev libcairo2-dev libpango1.0-dev libgl1-mesa-dev 
+          #   apt install libgl1-mesa-glx libssl-dev libevdev-dev m4 libpulse-dev
+          #   apt install libasound2-dev libfreetype6-dev libx11-dev libxrender-dev
+          #   apt install libtool automake autoconf libltdl-dev
 
 # Other packages:
 # uuid-runtime libsm-dev libice-dev cmake 
 
-          env: | # Copy the entire environment for the docker container
-            RUNNER_OS: Linux
-            ARCH: ${{ env.ARCH }}
-            ARCH_ARM: ${{ env.ARCH_ARM }}
-            FLAVOR: ${{ env.FLAVOR }}
-            MODE: ${{ env.MODE }}
-            HEARTBEAT: ${{ env.HEARTBEAT }}
+          # env: | # Copy the entire environment for the docker container
+          #   RUNNER_OS: Linux
+          #   ARCH: ${{ env.ARCH }}
+          #   ARCH_ARM: ${{ env.ARCH_ARM }}
+          #   FLAVOR: ${{ env.FLAVOR }}
+          #   MODE: ${{ env.MODE }}
+          #   HEARTBEAT: ${{ env.HEARTBEAT }}
 
-          run: ./scripts/ci/actions_build.sh
+          # run: ./scripts/ci/actions_build.sh
 
-      - name: Export variables from build step
-        run: |
-          echo "ASSET_REVISION=${{ steps.build-vm.outputs.ASSET_REVISION }}" >> $GITHUB_ENV
-          echo "ASSET_NAME=${{ steps.build-vm.outputs.ASSET_NAME }}" >> $GITHUB_ENV
-          echo "BUILD_PATH=${{ steps.build-vm.outputs.BUILD_PATH }}" >> $GITHUB_ENV
-          echo "PRODUCTS_PATH=${{ steps.build-vm.outputs.PRODUCTS_PATH }}" >> $GITHUB_ENV
-          echo "APP_NAME=${{ steps.build-vm.outputs.APP_NAME }}" >> $GITHUB_ENV
+      # - name: Export variables from build step
+      #   run: |
+      #     echo "ASSET_REVISION=${{ steps.build-vm.outputs.ASSET_REVISION }}" >> $GITHUB_ENV
+      #     echo "ASSET_NAME=${{ steps.build-vm.outputs.ASSET_NAME }}" >> $GITHUB_ENV
+      #     echo "BUILD_PATH=${{ steps.build-vm.outputs.BUILD_PATH }}" >> $GITHUB_ENV
+      #     echo "PRODUCTS_PATH=${{ steps.build-vm.outputs.PRODUCTS_PATH }}" >> $GITHUB_ENV
+      #     echo "APP_NAME=${{ steps.build-vm.outputs.APP_NAME }}" >> $GITHUB_ENV
 
       # - name: Sign VM (not implemented)
       #   if: false
       #   run: ./deploy/sign-vm.sh
 
-      - name: Pack VM
-        run: ./deploy/pack-vm.sh
-
-      - name: Store artifact w/ revision
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.ASSET_NAME }}_${{ env.ASSET_REVISION }}
-          path: ${{ env.PRODUCTS_PATH }}/${{ env.ASSET_NAME }}.${{ env.ASSET_EXTENSION }}
-
-      - name: Update artifact in latest-release
-        uses: ncipollo/release-action@v1.8.6
-        if: github.event_name == 'push' && endsWith( github.ref , 'Cog' )
-        with:
-          prerelease: true
-          allowUpdates: true
-          replacesArtifacts: true
-          artifacts: ${{ env.PRODUCTS_PATH }}/${{ env.ASSET_NAME }}.${{ env.ASSET_EXTENSION }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ matrix.mode == 'debug' && 'latest-debug-build' || matrix.mode == 'assert' && 'latest-assert-build' || 'latest-build' }}
-          body: ${{ github.event.head_commit.message }}
+      # - name: Pack VM
+      #   run: ./deploy/pack-vm.sh
+
+      # - name: Store artifact w/ revision
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: ${{ env.ASSET_NAME }}_${{ env.ASSET_REVISION }}
+      #     path: ${{ env.PRODUCTS_PATH }}/${{ env.ASSET_NAME }}.${{ env.ASSET_EXTENSION }}
+
+      # - name: Update artifact in latest-release
+      #   uses: ncipollo/release-action@v1.8.6
+      #   if: github.event_name == 'push' && endsWith( github.ref , 'Cog' )
+      #   with:
+      #     prerelease: true
+      #     allowUpdates: true
+      #     replacesArtifacts: true
+      #     artifacts: ${{ env.PRODUCTS_PATH }}/${{ env.ASSET_NAME }}.${{ env.ASSET_EXTENSION }}
+      #     token: ${{ secrets.GITHUB_TOKEN }}
+      #     tag: ${{ matrix.mode == 'debug' && 'latest-debug-build' || matrix.mode == 'assert' && 'latest-assert-build' || 'latest-build' }}
+      #     body: ${{ github.event.head_commit.message }}
diff --git a/scripts/ci/actions_build.sh b/scripts/ci/actions_build.sh
@@ -46,7 +46,7 @@ skip_BochsPlugins() {
 
 export_variable() {
     local var_name=$1
-    local var_vaue=$2
+    local var_value=$2
     if [[ ! -z "${ARM_ARCH}" ]]; then
         # We are in a docker container. See https://github.com/uraimo/run-on-arch-action
         echo "::set-output name=${var_name}::${var_value}"