Skip to content

Commit ff3b7cd

Browse files
committed
Work Dev Containers
- Fix path to docker file. ***NO_CI***
1 parent e550a70 commit ff3b7cd

5 files changed

+20
-40
lines changed

.github/workflows/devcontainer-all.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,13 @@ jobs:
2222
- name: Checkout Repository
2323
uses: actions/checkout@v2
2424

25-
- name: Read docker file content
26-
id: read_dockerfile
27-
uses: andstor/file-reader-action@v1
28-
with:
29-
path: '.devcontainer/Dockerfile.All'
30-
3125
- name: Get container version
3226
run: |
33-
$dockerfileContent = "${ steps.read_dockerfile.outputs.contents }"
27+
$dockerfileContent = Get-Content(".devcontainer/Dockerfile.All")
3428
$dockerfileContent -match '(?<=\:v)(?:\d+.\d+)'
35-
echo "GCR_VERSION=$Matches[0]" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
29+
$containerVersion = $Matches[0].ToString()
30+
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
31+
shell: pwsh
3632

3733
- name: Login to GitHub Container Registry
3834
uses: docker/login-action@v1

.github/workflows/devcontainer-azurertos.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,13 @@ jobs:
2222
- name: Checkout Repository
2323
uses: actions/checkout@v2
2424

25-
- name: Read docker file content
26-
id: read_dockerfile
27-
uses: andstor/file-reader-action@v1
28-
with:
29-
path: '.devcontainer/Dockerfile.AzureRTOS'
30-
3125
- name: Get container version
3226
run: |
33-
$dockerfileContent = "${ steps.read_dockerfile.outputs.contents }"
27+
$dockerfileContent = Get-Content(".devcontainer/Dockerfile.AzureRTOS")
3428
$dockerfileContent -match '(?<=\:v)(?:\d+.\d+)'
35-
echo "GCR_VERSION=$Matches[0]" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
29+
$containerVersion = $Matches[0].ToString()
30+
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
31+
shell: pwsh
3632

3733
- name: Login to GitHub Container Registry
3834
uses: docker/login-action@v1

.github/workflows/devcontainer-chibios.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,13 @@ jobs:
2222
- name: Checkout Repository
2323
uses: actions/checkout@v2
2424

25-
- name: Read docker file content
26-
id: read_dockerfile
27-
uses: andstor/file-reader-action@v1
28-
with:
29-
path: '.devcontainer/Dockerfile.ChibiOS'
30-
3125
- name: Get container version
3226
run: |
33-
$dockerfileContent = "${ steps.read_dockerfile.outputs.contents }"
27+
$dockerfileContent = Get-Content(".devcontainer/Dockerfile.ChibiOS")
3428
$dockerfileContent -match '(?<=\:v)(?:\d+.\d+)'
35-
echo "GCR_VERSION=$Matches[0]" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
29+
$containerVersion = $Matches[0].ToString()
30+
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
31+
shell: pwsh
3632

3733
- name: Login to GitHub Container Registry
3834
uses: docker/login-action@v1

.github/workflows/devcontainer-esp32.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,13 @@ jobs:
2222
- name: Checkout Repository
2323
uses: actions/checkout@v2
2424

25-
- name: Read docker file content
26-
id: read_dockerfile
27-
uses: andstor/file-reader-action@v1
28-
with:
29-
path: '.devcontainer/Dockerfile.ESP32'
30-
3125
- name: Get container version
3226
run: |
33-
$dockerfileContent = "${ steps.read_dockerfile.outputs.contents }"
27+
$dockerfileContent = Get-Content(".devcontainer/Dockerfile.ESP32")
3428
$dockerfileContent -match '(?<=\:v)(?:\d+.\d+)'
35-
echo "GCR_VERSION=$Matches[0]" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
29+
$containerVersion = $Matches[0].ToString()
30+
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
31+
shell: pwsh
3632

3733
- name: Login to GitHub Container Registry
3834
uses: docker/login-action@v1

.github/workflows/devcontainer-ti.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,13 @@ jobs:
2222
- name: Checkout Repository
2323
uses: actions/checkout@v2
2424

25-
- name: Read docker file content
26-
id: read_dockerfile
27-
uses: andstor/file-reader-action@v1
28-
with:
29-
path: '.devcontainer/Dockerfile.TI'
30-
3125
- name: Get container version
3226
run: |
33-
$dockerfileContent = "${ steps.read_dockerfile.outputs.contents }"
27+
$dockerfileContent = Get-Content(".devcontainer/Dockerfile.TI")
3428
$dockerfileContent -match '(?<=\:v)(?:\d+.\d+)'
35-
echo "GCR_VERSION=$Matches[0]" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
29+
$containerVersion = $Matches[0].ToString()
30+
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
31+
shell: pwsh
3632

3733
- name: Login to GitHub Container Registry
3834
uses: docker/login-action@v1

0 commit comments

Comments
 (0)