Work Dev Containers

- Fix path to docker file. ***NO_CI***
nanoframework · Feb 9, 2022 · ff3b7cd · ff3b7cd
1 parent e550a70
commit ff3b7cd
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 40 deletions.
diff --git a/.github/workflows/devcontainer-all.yaml b/.github/workflows/devcontainer-all.yaml
@@ -22,17 +22,13 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
 
-    - name: Read docker file content
-      id: read_dockerfile
-      uses: andstor/file-reader-action@v1
-      with:
-        path: '.devcontainer/Dockerfile.All'
-
     - name: Get container version
       run: |
-        $dockerfileContent = "${ steps.read_dockerfile.outputs.contents }"
+        $dockerfileContent = Get-Content(".devcontainer/Dockerfile.All")
         $dockerfileContent -match '(?<=\:v)(?:\d+.\d+)'
-        echo "GCR_VERSION=$Matches[0]" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        $containerVersion = $Matches[0].ToString()
+        echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+      shell: pwsh
 
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v1

diff --git a/.github/workflows/devcontainer-azurertos.yaml b/.github/workflows/devcontainer-azurertos.yaml
@@ -22,17 +22,13 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
 
-    - name: Read docker file content
-      id: read_dockerfile
-      uses: andstor/file-reader-action@v1
-      with:
-        path: '.devcontainer/Dockerfile.AzureRTOS'
-
     - name: Get container version
       run: |
-        $dockerfileContent = "${ steps.read_dockerfile.outputs.contents }"
+        $dockerfileContent = Get-Content(".devcontainer/Dockerfile.AzureRTOS")
         $dockerfileContent -match '(?<=\:v)(?:\d+.\d+)'
-        echo "GCR_VERSION=$Matches[0]" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        $containerVersion = $Matches[0].ToString()
+        echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+      shell: pwsh
 
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v1

diff --git a/.github/workflows/devcontainer-chibios.yaml b/.github/workflows/devcontainer-chibios.yaml
@@ -22,17 +22,13 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
 
-    - name: Read docker file content
-      id: read_dockerfile
-      uses: andstor/file-reader-action@v1
-      with:
-        path: '.devcontainer/Dockerfile.ChibiOS'
-
     - name: Get container version
       run: |
-        $dockerfileContent = "${ steps.read_dockerfile.outputs.contents }"
+        $dockerfileContent = Get-Content(".devcontainer/Dockerfile.ChibiOS")
         $dockerfileContent -match '(?<=\:v)(?:\d+.\d+)'
-        echo "GCR_VERSION=$Matches[0]" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        $containerVersion = $Matches[0].ToString()
+        echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+      shell: pwsh
 
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v1

diff --git a/.github/workflows/devcontainer-esp32.yml b/.github/workflows/devcontainer-esp32.yml
@@ -22,17 +22,13 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
 
-    - name: Read docker file content
-      id: read_dockerfile
-      uses: andstor/file-reader-action@v1
-      with:
-        path: '.devcontainer/Dockerfile.ESP32'
-
     - name: Get container version
       run: |
-        $dockerfileContent = "${ steps.read_dockerfile.outputs.contents }"
+        $dockerfileContent = Get-Content(".devcontainer/Dockerfile.ESP32")
         $dockerfileContent -match '(?<=\:v)(?:\d+.\d+)'
-        echo "GCR_VERSION=$Matches[0]" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        $containerVersion = $Matches[0].ToString()
+        echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+      shell: pwsh
 
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v1

diff --git a/.github/workflows/devcontainer-ti.yaml b/.github/workflows/devcontainer-ti.yaml
@@ -22,17 +22,13 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
 
-    - name: Read docker file content
-      id: read_dockerfile
-      uses: andstor/file-reader-action@v1
-      with:
-        path: '.devcontainer/Dockerfile.TI'
-
     - name: Get container version
       run: |
-        $dockerfileContent = "${ steps.read_dockerfile.outputs.contents }"
+        $dockerfileContent = Get-Content(".devcontainer/Dockerfile.TI")
         $dockerfileContent -match '(?<=\:v)(?:\d+.\d+)'
-        echo "GCR_VERSION=$Matches[0]" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        $containerVersion = $Matches[0].ToString()
+        echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+      shell: pwsh
 
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v1