Build updates, artifact name

.github/workflows/firmware.yml

@@ -7,40 +7,40 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Cache pip
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
+    - uses: actions/checkout@v3
+
+    - name: Setup env
+      run: |
+        echo "OC_ARTIFACT_TAG=${GITHUB_REF_NAME}-$(software/o_c_REV/resources/oc_build_tag.sh)" | tr '/' '_' >> $GITHUB_ENV
+
     - name: Cache PlatformIO
       uses: actions/cache@v2
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+
     - name: Set up Python
-      uses: actions/setup-python@v2
-    - name: Install PlatformIO
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade platformio
+      uses: actions/setup-python@v3
+      with:
+        python-version: '3.x'
+        cache: 'pip'
+        cache-dependency-path: '**/requirements.txt'
 
-    - name: Build firmware
-      working-directory: software/o_c_REV/
-      run: pio run -e oc_prod
+    - run: |
+        pip3 install --upgrade pip
+        pip3 install -r .github/workflows/requirements.txt
 
-    - name: Build flipped firmware
+    - name: Build firmware
       working-directory: software/o_c_REV/
-      run: pio run -e oc_prod_180
+      run: |
+        pio run -e oc_prod
+        pio run -e oc_prod_180
 
     - name: Copy artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
-        name: o_C-${{github.sha}}
+        name: o_C-${{env.OC_ARTIFACT_TAG}}
         path: software/o_c_REV/.pio/build/*/*.hex

.github/workflows/requirements.txt

@@ -0,0 +1 @@
+platformio

software/o_c_REV/resources/oc_build_tag.sh

@@ -3,8 +3,8 @@
 git_rev="$(git rev-parse --short HEAD)"
 git_status="$(git status -s --untracked-files=no)"
 
-if [[ -n "$git_status" ]] ; then
+if [ -n "$git_status" ] ; then
 	suffix="dirty"
 fi
 
-echo "$git_rev $suffix"
+echo "${git_rev}${suffix}"