Merge pull request #9 from sifive/bump-ci

Bump CI

Author: nategraff-sifive

.github/workflows/wake.yml

@@ -9,41 +9,19 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    env:
-      # $WIT_WORKSPACE path is relative to $GITHUB_WORKSPACE
-      WIT_WORKSPACE: wit-workspace
 
     steps:
-      - uses: actions/checkout@v2
-        with:
-          path: wit-packages/cmsis-svd-generator
-
       - name: 'Init Wit Workspace'
-        uses: sifive/wit/actions/wit@v0.12.0
+        uses: sifive/wit/actions/init@v0.13.2
         with:
-          command: init
-          arguments: |
-            ${{ env.WIT_WORKSPACE }}
-            -a ./wit-packages/cmsis-svd-generator
-            -a [email protected]:sifive/environment-blockci-sifive.git::0.3.0
-          force_github_https: true
+          additional_packages: [email protected]:sifive/environment-blockci-sifive.git::0.7.1
 
       - name: 'Run Wake API Test'
-        run: |
-          set -euo pipefail
-          docker run \
-            --volume="$GITHUB_WORKSPACE/$WIT_WORKSPACE:/mnt/workspace" \
-            --workdir="/mnt/workspace" \
-            --rm \
-            sifive/environment-blockci:0.3.0 \
-            cmsis-svd-generator/tests/test-wake-api.sh
+        uses: sifive/environment-blockci-sifive/actions/[email protected]
+        with:
+          command: cmsis-svd-generator/tests/test-wake-api.sh
 
       - name: 'Run generator install test'
-        run: |
-          set -euo pipefail
-          docker run \
-            --volume="$GITHUB_WORKSPACE/$WIT_WORKSPACE:/mnt/workspace" \
-            --workdir="/mnt/workspace" \
-            --rm \
-            sifive/environment-blockci:0.3.0 \
-            cmsis-svd-generator/tests/test-wake-install.sh
+        uses: sifive/environment-blockci-sifive/actions/[email protected]
+        with:
+          command: cmsis-svd-generator/tests/test-wake-install.sh

build.wake

@@ -31,9 +31,10 @@ global def runSVDGenerator options =
     # Python sources and the svd template files
     def generatorSources = sources here `.*\.(py|svd)`
     def dtsSources = topDTSFile, otherDTSFiles
-    generatorSources ++ dtsSources
+    def outDir = mkdir "{output}/.."
+    outDir, generatorSources ++ dtsSources
 
-  def outputs = options.getSVDGeneratorOptionsOutputFile, Nil
+  def output = options.getSVDGeneratorOptionsOutputFile
 
   def args =
     def output =
@@ -49,7 +50,7 @@ global def runSVDGenerator options =
   makePlan (pythonCommand "{generatorDir}/generate_svd.py" args) inputs
   | addPlanRelativePath "PYTHONPATH" generatorDir
   | addPythonRequirementsEnv generatorDir
-  | setPlanFnOutputs (\_ outputs)
+  | setPlanFnOutputs (\_ output, Nil)
   | runJob
 
 # This allows the python virtualenv to be created prior to running a build

tests/test-wake-api.sh

@@ -9,7 +9,7 @@ OUTPUT_PATH="build/cmsis-svd-generator/design.svd"
 
 wake --init .
 
-wake -v "runSVDGenerator (makeSVDGeneratorOptions (source \"${SPIKE_DTS_DIR}/design.dts\") (sources \"${SPIKE_DTS_DIR}\" \`core.dts\`) \"${OUTPUT_PATH}\")"
+wake -v -x "runSVDGenerator (makeSVDGeneratorOptions (source \"${SPIKE_DTS_DIR}/design.dts\") (sources \"${SPIKE_DTS_DIR}\" \`core.dts\`) \"${OUTPUT_PATH}\")"
 
 >&2 echo "$0: Checking for ${OUTPUT_PATH}"
 if [ ! -f ${OUTPUT_PATH} ] ; then

tests/test-wake-install.sh

@@ -6,7 +6,7 @@ INSTALL_PATH="install-path"
 
 wake --init .
 
-wake -v "installSVDGenerator \"${INSTALL_PATH}\""
+wake -v -x "installSVDGenerator \"${INSTALL_PATH}\""
 
 >&2 echo "$0: Checking for ${INSTALL_PATH}"
 if [ ! -d ${INSTALL_PATH} ] ; then

wit-manifest.json

@@ -1,6 +1,6 @@
 [
     {
-        "commit": "a2e36e2c523c66d499810bd52a2956623e2066f6",
+        "commit": "e135f6a013d830f34aeb1a9542f42c0aabc80813",
         "name": "api-languages-sifive",
         "source": "[email protected]:sifive/api-languages-sifive.git"
     }