Compare commits

..

7 Commits

Author SHA1 Message Date
9511aa49c7 Add Windows workflow
Add Windows workflow

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-09-01 23:43:47 +02:00
4a98c0ebf9 Merge pull request #575 from bensuperpc/update_openssh
Update openSSH to V_8_7_P1
2021-09-01 09:57:53 +02:00
61d67a6c27 Merge pull request #574 from bensuperpc/update_openssl
Update openssl to 1.1.1i
2021-09-01 07:07:45 +02:00
22aed58e56 Merge branch 'dockcross:master' into update_openssh 2021-09-01 01:58:25 +02:00
b456e8a0fa Merge pull request #573 from bensuperpc/update-web-wasm
Update emscripten to 2.0.29
2021-09-01 01:57:22 +02:00
71d4c783b1 Update openSSH to V_8_7_P1
Update openSSH to V_8_7_P1

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-08-31 22:19:41 +02:00
7764b101d4 Update emscripten to 2.0.29
Update emscripten to 2.0.29

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-08-31 22:00:48 +02:00
4 changed files with 124 additions and 4 deletions

View File

@ -1,4 +1,4 @@
name: Dockcross CI name: Dockcross CI (Main)
on: on:
push: push:

120
.github/workflows/windows.yml vendored Normal file
View File

@ -0,0 +1,120 @@
name: Dockcross CI (Windows)
# Only to test and build some docker images on Windows
on:
push:
branches:
- '*'
paths-ignore:
- '**.md'
pull_request:
branches:
- '*'
paths-ignore:
- '**.md'
workflow_dispatch:
jobs:
base:
name: base
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: build
run: make base
- name: test
run: make base.test
- name: archive base
run: |
mkdir -p cache
docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base-windows.tar.xz
- name: save base
uses: actions/upload-artifact@v2
with:
name: cache
path: ./cache
retention-days: 1
- name: deploy
if: github.ref == 'refs/heads/master'
run: |
docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
docker image push dockcross/base --all-tags
image:
name: ${{ matrix.arch_name.image }}
needs: base
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
arch_name:
# Android images
# - { image: "android-arm" }
- { image: "android-arm64" }
# - { image: "android-x86" }
# - { image: "android-x86_64" }
# Linux arm64/armv8 images
- { image: "linux-arm64" }
- { image: "linux-arm64-musl" }
- { image: "linux-arm64-full" }
# Linux armv5 images
# - { image: "linux-armv5" }
# - { image: "linux-armv5-musl" }
# Linux armv6 images
# - { image: "linux-armv6" }
# - { image: "linux-armv6-lts" }
# - { image: "linux-armv6-musl" }
# Linux armv7 images
# - { image: "linux-armv7" }
# - { image: "linux-armv7a" }
# - { image: "linux-armv7l-musl" }
# Linux x86 images
- { image: "linux-x86" }
# Linux x86_64 images
- { image: "linux-x64" }
- { image: "linux-x64-tinycc" }
- { image: "linux-x64-clang" }
# - { image: "linux-x86_64-full" }
# Linux riscv images
# - { image: "linux-riscv32" }
# - { image: "linux-riscv64" }
# Linux s390x images
# - { image: "linux-s390x" }
# Linux mips images
# - { image: "linux-mips" }
# Linux ppc64le images
# - { image: "linux-ppc64le" }
# Linux m68k images
# - { image: "linux-m68k-uclibc" }
# Linux xtensa images
# - { image: "linux-xtensa-uclibc" }
# Windows x86_x64 images
- { image: "windows-static-x64" }
# - { image: "windows-static-x64-posix" }
- { image: "windows-static-x64" }
# - { image: "windows-shared-x64" }
- { image: "windows-shared-x64-posix" }
# Windows x86 images
# - { image: "windows-static-x86" }
# - { image: "windows-shared-x86" }
# Windows arm images
# - { image: "windows-armv7" }
- { image: "windows-arm64" }
# manylinux2014 images
# - { image: "manylinux2014-x86" }
- { image: "manylinux2014-x64" }
# - { image: "manylinux2014-aarch64" }
# web-wasm images
- { image: "web-wasm" }
steps:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v2
with:
name: cache
path: ./cache
- name: load base
run: xz -d -k < ./cache/base-windows.tar.xz | docker load
- name: build
run: make ${{ matrix.arch_name.image }}
- name: basic test
run: make ${{ matrix.arch_name.image }}.test

View File

@ -2,7 +2,7 @@
set -ex set -ex
OPENSSH_ROOT=V_8_5_P1 OPENSSH_ROOT=V_8_7_P1
cd /usr/src cd /usr/src
curl --connect-timeout 20 \ curl --connect-timeout 20 \

View File

@ -1,4 +1,4 @@
FROM emscripten/emsdk:2.0.27 FROM emscripten/emsdk:2.0.29
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Revert back to "/bin/sh" as default shell # Revert back to "/bin/sh" as default shell
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
#include "common.docker" #include "common.docker"
ENV EMSCRIPTEN_VERSION 2.0.27 ENV EMSCRIPTEN_VERSION 2.0.29
ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH} ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
ENV CC=/emsdk/upstream/emscripten/emcc \ ENV CC=/emsdk/upstream/emscripten/emcc \