Skip to content

Commit

Permalink
Move to main branch (#2280)
Browse files Browse the repository at this point in the history
  • Loading branch information
josesimoes authored Mar 30, 2022
2 parents 58bcad3 + c4a5162 commit 31224a3
Show file tree
Hide file tree
Showing 205 changed files with 5,294 additions and 2,062 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile.All
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-all:v2.5
FROM ghcr.io/nanoframework/dev-container-all:v2.9
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile.AzureRTOS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.1
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.2
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile.ChibiOS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-chibios:v1.3
FROM ghcr.io/nanoframework/dev-container-chibios:v1.4
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile.ESP32
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-esp32:v2.4
FROM ghcr.io/nanoframework/dev-container-esp32:v2.7
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile.TI
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-ti:v1.2
FROM ghcr.io/nanoframework/dev-container-ti:v1.4
Binary file modified .devcontainer/README.md
Binary file not shown.
6 changes: 3 additions & 3 deletions .devcontainer/sources/Dockerfile.All
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ RUN git clone --branch STABLE-2_0_3_RELEASE https://git.savannah.nongnu.org/git/
ENV GIT_SSL_NO_VERIFY=0

# Clone ESP-IDF
RUN git clone --branch v4.3.2 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
RUN git clone --branch v4.4 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf

# Clone what is needed for TI
RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git --depth 1 ./sources/SimpleLinkCC32 \
# you can't use the nanoFramework repository as it's Windows only
# && git clone --branch 3.61.00.16 https://github.com/nanoframework/TI_XDCTools.git --depth 1 ./sources/TI_XDCTools \
&& git clone --branch 5.30.01.01 https://github.com/nanoframework/SimpleLink_CC13xx_26xx_SDK.git --depth 1 ./sources/SimpleLinkCC13 \
&& git clone --branch 5.40.00.40 https://github.com/nanoframework/SimpleLink_CC13xx_26xx_SDK.git --depth 1 ./sources/SimpleLinkCC13 \
&& git clone --branch 1.10.0 https://github.com/nanoframework/TI_SysConfig.git --depth 1 ./sources/TI_SysConfig \
&& chmod +x ./sources/TI_SysConfig/sysconfig_cli.sh

Expand All @@ -104,7 +104,7 @@ RUN ln -fs /usr/bin/python3 /usr/bin/python \
ENV IDF_PATH=/sources/esp-idf
RUN python -m pip install -r $IDF_PATH/requirements.txt
RUN $IDF_PATH/install.sh
ENV PATH=$PATH:/$IDF_PATH/components/esptool_py/esptool:/$IDF_PATH/components/espcoredump:/$IDF_PATH/components/partition_table/:/$IDF_PATH/tools/:$IDF_PATH/components/app_update:/root/.espressif/tools/xtensa-esp32-elf/esp-2021r2-8.4.0/xtensa-esp32-elf/bin:/root/.espressif/tools/xtensa-esp32s2-elf/esp-2021r2-8.4.0/xtensa-esp32s2-elf/bin:/root/.espressif/tools/riscv32-esp-elf/esp-2021r2-8.4.0/riscv32-esp-elf/bin
ENV PATH=$PATH:$IDF_PATH/components/esptool_py/esptool:$IDF_PATH/components/espcoredump:$IDF_PATH/components/partition_table/:$IDF_PATH/tools/:$IDF_PATH/components/app_update:/root/.espressif/tools/xtensa-esp32-elf/esp-2021r2-8.4.0/xtensa-esp32-elf/bin:/root/.espressif/tools/xtensa-esp32s2-elf/esp-2021r2-8.4.0/xtensa-esp32s2-elf/bin:/root/.espressif/tools/riscv32-esp-elf/esp-2021r2-8.4.0/riscv32-esp-elf/bin

# Clean up downloaded files
RUN apt-get autoremove -y \
Expand Down
8 changes: 2 additions & 6 deletions .devcontainer/sources/Dockerfile.ESP32
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,9 @@ RUN mkdir -p /usr/local/bin/gcc
# Clone mbedtls and fatfs
RUN git clone --branch mbedtls-2.28.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
&& git clone --branch R0.14 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
# Clone FreeRTOS and what is needed for ESP32
RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-Kernel.git --depth 1 ./sources/FreeRTOS \
&& git clone --branch 5.5.1 https://github.com/ARM-software/CMSIS_5.git --depth 1 ./sources/CMSIS_5 \
&& git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs

# Clone ESP-IDF
RUN git clone --branch v4.3.2 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
RUN git clone --branch v4.4 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf

# Copy from our other container
COPY --from=downloader /tmp/dc-extracted/gcc /usr/local/bin/gcc
Expand All @@ -68,7 +64,7 @@ RUN ln -fs /usr/bin/python3 /usr/bin/python \
ENV IDF_PATH=/sources/esp-idf
RUN python -m pip install -r $IDF_PATH/requirements.txt
RUN $IDF_PATH/install.sh
ENV PATH=$PATH:/$IDF_PATH/components/esptool_py/esptool:/$IDF_PATH/components/espcoredump:/$IDF_PATH/components/partition_table/:/$IDF_PATH/tools/:$IDF_PATH/components/app_update:/root/.espressif/tools/xtensa-esp32-elf/esp-2021r2-8.4.0/xtensa-esp32-elf/bin:/root/.espressif/tools/xtensa-esp32s2-elf/esp-2021r2-8.4.0/xtensa-esp32s2-elf/bin:/root/.espressif/tools/riscv32-esp-elf/esp-2021r2-8.4.0/riscv32-esp-elf/bin
ENV PATH=$PATH:$IDF_PATH/components/esptool_py/esptool:$IDF_PATH/components/espcoredump:$IDF_PATH/components/partition_table/:$IDF_PATH/tools/:$IDF_PATH/components/app_update:/root/.espressif/tools/xtensa-esp32-elf/esp-2021r2-8.4.0/xtensa-esp32-elf/bin:/root/.espressif/tools/xtensa-esp32s2-elf/esp-2021r2-8.4.0/xtensa-esp32s2-elf/bin:/root/.espressif/tools/riscv32-esp-elf/esp-2021r2-8.4.0/riscv32-esp-elf/bin

# Clean up downloaded files
RUN apt-get autoremove -y \
Expand Down
5 changes: 1 addition & 4 deletions .devcontainer/sources/Dockerfile.TI
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,11 @@ RUN apt-get update \
RUN mkdir -p /usr/local/bin/gcc \
&& mkdir -p /usr/local/bin/titools

# Clone mbedtls and fatfs
RUN git clone --branch mbedtls-2.28.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
&& git clone --branch R0.14 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
# Clone what is needed for TI
RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git --depth 1 ./sources/SimpleLinkCC32 \
# you can't use the nanoFramework repository as it's Windows only
# && git clone --branch 3.61.00.16 https://github.com/nanoframework/TI_XDCTools.git --depth 1 ./sources/TI_XDCTools \
&& git clone --branch 5.30.01.01 https://github.com/nanoframework/SimpleLink_CC13xx_26xx_SDK.git --depth 1 ./sources/SimpleLinkCC13 \
&& git clone --branch 5.40.00.40 https://github.com/nanoframework/SimpleLink_CC13xx_26xx_SDK.git --depth 1 ./sources/SimpleLinkCC13 \
&& git clone --branch 1.10.0 https://github.com/nanoframework/TI_SysConfig.git --depth 1 ./sources/TI_SysConfig \
&& chmod +x ./sources/TI_SysConfig/sysconfig_cli.sh

Expand Down
40 changes: 40 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<!--- In the TITLE (↑↑↑↑ above ↑↑↑↑ **NOT HERE**) provide a general, short summary of your changes -->
<!--- Please DO NOT use references to other PR's or issues -->

## Description
<!--- Describe your changes in detail -->
<!--- Bulleted list. Full sentences. Ending with a dot. -->

## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!--- If this **fixes** OR **closes** OR **resolves** an open issue, please link to the issue there using the template bellow (mind the pattern to link there as all issues are tracked in the Home repository) -->
<!--- **JUST** replace NNNNN with the issue number -->
- Fixes/Closes/Resolves nanoFramework/Home#NNNN

## How Has This Been Tested?<!-- (IF APPLICABLE) -->
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->

## Screenshots<!-- (IF APPLICABLE): -->

## Types of changes
<!--- What types of changes does this PR introduce? Put an `x` in all the boxes that apply: -->
- [ ] Improvement (non-breaking change that improves a feature, code or algorithm)
- [ ] Bug fix (non-breaking change which fixes an issue with code or algorithm)
- [ ] New feature (non-breaking change which adds functionality to code)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] Config and build (change in the configuration and build system, has no impact on code or features)
- [ ] Dev Containers (changes related with Dev Containers, has no impact on code or features)
- [ ] Dependencies (update dependencies and changes associated, has no impact on code or features)
- [ ] Documentation (changes or updates in the documentation, has no impact on code or features)

## Checklist
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
<!--- PLEASE PLEASE PLEASE don't tick all of them just because -->
- [ ] My code follows the code style of this project (only if there are changes in source code).
- [ ] My changes require an update to the documentation (there are changes that require the docs website to be updated).
- [ ] I have updated the documentation accordingly (the changes require an update on the docs in this repo).
- [ ] I have read the [CONTRIBUTING](https://github.com/nanoframework/.github/blob/main/CONTRIBUTING.md) document.
- [ ] I have tested everything locally and all new and existing tests passed (only if there are changes in source code).
Original file line number Diff line number Diff line change
@@ -1,31 +1,37 @@
name: Build and push image for all RTOS
# Copyright (c) .NET Foundation and Contributors
# See LICENSE file in the project root for full license information.

name: Build Dev Container for all platforms

env:
GCR_IMAGE: ghcr.io/nanoframework/dev-container-all
GCR_VERSION: v2.5
GCR_FILE: .devcontainer/sources/Dockerfile.All

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ develop ]
paths: [ .devcontainer/sources/Dockerfile.All ]
branches:
- develop
paths:
- '**Dockerfile.All'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

- name: Checkout Repository
uses: actions/checkout@v2

- name: Get container version
run: |
$dockerfileContent = Get-Content(".devcontainer/Dockerfile.All")
$dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
$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
with:
Expand All @@ -40,4 +46,4 @@ jobs:
push: true # Will only build if this is not here
tags: |
${{ env.GCR_IMAGE }}:${{ env.GCR_VERSION }}
${{ env.GCR_IMAGE }}:latest
${{ env.GCR_IMAGE }}:latest
Original file line number Diff line number Diff line change
@@ -1,31 +1,37 @@
name: Build and push image for Azure RTOS
# Copyright (c) .NET Foundation and Contributors
# See LICENSE file in the project root for full license information.

name: Build Dev Container for Azure RTOS

env:
GCR_IMAGE: ghcr.io/nanoframework/dev-container-azure-rtos
GCR_VERSION: v1.1
GCR_FILE: .devcontainer/sources/Dockerfile.AzureRTOS

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ develop ]
paths: [ .devcontainer/sources/Dockerfile.AzureRTOS ]
branches:
- develop
paths:
- '**Dockerfile.AzureRTOS'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

- name: Checkout Repository
uses: actions/checkout@v2

- name: Get container version
run: |
$dockerfileContent = Get-Content(".devcontainer/Dockerfile.AzureRTOS")
$dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
$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
with:
Expand All @@ -40,4 +46,5 @@ jobs:
push: true # Will only build if this is not here
tags: |
${{ env.GCR_IMAGE }}:${{ env.GCR_VERSION }}
${{ env.GCR_IMAGE }}:latest
${{ env.GCR_IMAGE }}:latest
Original file line number Diff line number Diff line change
@@ -1,31 +1,37 @@
name: Build and push ChibiOS image
# Copyright (c) .NET Foundation and Contributors
# See LICENSE file in the project root for full license information.

name: Build Dev Container for ChibiOS

env:
GCR_IMAGE: ghcr.io/nanoframework/dev-container-chibios
GCR_VERSION: v1.3
GCR_FILE: .devcontainer/sources/Dockerfile.ChibiOS

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ develop ]
paths: [ .devcontainer/sources/Dockerfile.ChibiOS ]
branches:
- develop
paths:
- '**Dockerfile.ChibiOS'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

- name: Checkout Repository
uses: actions/checkout@v2

- name: Get container version
run: |
$dockerfileContent = Get-Content(".devcontainer/Dockerfile.ChibiOS")
$dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
$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
with:
Expand All @@ -40,4 +46,4 @@ jobs:
push: true # Will only build if this is not here
tags: |
${{ env.GCR_IMAGE }}:${{ env.GCR_VERSION }}
${{ env.GCR_IMAGE }}:latest
${{ env.GCR_IMAGE }}:latest
Original file line number Diff line number Diff line change
@@ -1,31 +1,37 @@
name: Build and push ESP32 image
# Copyright (c) .NET Foundation and Contributors
# See LICENSE file in the project root for full license information.

name: Build Dev Container for ESP32

env:
GCR_IMAGE: ghcr.io/nanoframework/dev-container-esp32
GCR_VERSION: v2.4
GCR_FILE: .devcontainer/sources/Dockerfile.ESP32

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ develop ]
paths: [ .devcontainer/sources/Dockerfile.ESP32 ]
branches:
- develop
paths:
- '**Dockerfile.ESP32'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

- name: Checkout Repository
uses: actions/checkout@v2

- name: Get container version
run: |
$dockerfileContent = Get-Content(".devcontainer/Dockerfile.ESP32")
$dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
$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
with:
Expand All @@ -40,4 +46,4 @@ jobs:
push: true # Will only build if this is not here
tags: |
${{ env.GCR_IMAGE }}:${{ env.GCR_VERSION }}
${{ env.GCR_IMAGE }}:latest
${{ env.GCR_IMAGE }}:latest
Loading

0 comments on commit 31224a3

Please sign in to comment.