mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-06-17 16:39:25 +02:00
Compare commits
12 Commits
Add_new_te
...
add_window
Author | SHA1 | Date | |
---|---|---|---|
9511aa49c7 | |||
4a98c0ebf9 | |||
61d67a6c27 | |||
22aed58e56 | |||
b456e8a0fa | |||
71d4c783b1 | |||
0b8587b72a | |||
7764b101d4 | |||
61ca500abd | |||
ec4c1de0ba | |||
519a6c8736 | |||
332bf7ad98 |
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@ -1,4 +1,4 @@
|
||||
name: Dockcross CI
|
||||
name: Dockcross CI (Main)
|
||||
|
||||
on:
|
||||
push:
|
||||
|
120
.github/workflows/windows.yml
vendored
Normal file
120
.github/workflows/windows.yml
vendored
Normal 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
|
@ -2,7 +2,7 @@
|
||||
|
||||
set -ex
|
||||
|
||||
OPENSSH_ROOT=V_8_5_P1
|
||||
OPENSSH_ROOT=V_8_7_P1
|
||||
|
||||
cd /usr/src
|
||||
curl --connect-timeout 20 \
|
||||
|
@ -47,9 +47,9 @@ source $MY_DIR/utils.sh
|
||||
# copied from https://github.com/pypa/manylinux/tree/master/docker/build_scripts
|
||||
#
|
||||
|
||||
OPENSSL_ROOT=openssl-1.1.1k
|
||||
# Hash from https://www.openssl.org/source/openssl-1.1.1k.tar.gz.sha256
|
||||
OPENSSL_HASH=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
|
||||
OPENSSL_ROOT=openssl-1.1.1i
|
||||
# Hash from https://www.openssl.org/source/openssl-1.1.1i.tar.gz.sha256
|
||||
OPENSSL_HASH=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
|
||||
OPENSSL_DOWNLOAD_URL=http://www.openssl.org/source/
|
||||
|
||||
# a recent enough perl is needed to build openssl
|
||||
|
@ -3,8 +3,8 @@ FROM dockcross/base:latest
|
||||
# This is for 64-bit ARM Linux machine
|
||||
|
||||
# Buildroot version
|
||||
# crosstool-ng master 2021-08-21
|
||||
ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
|
||||
# buildroot master 2021-08-30
|
||||
ENV BR_VERSION 2990d7dcb163a5618100a6985726b6820457a6d1
|
||||
|
||||
#include "common.buildroot"
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration
|
||||
# Buildroot 2021.08-rc2-75-g2990d7dcb1 Configuration
|
||||
#
|
||||
BR2_HAVE_DOT_CONFIG=y
|
||||
BR2_HOST_GCC_AT_LEAST_4_9=y
|
||||
@ -186,6 +186,7 @@ BR2_SSP_NONE=y
|
||||
BR2_RELRO_NONE=y
|
||||
# BR2_RELRO_PARTIAL is not set
|
||||
# BR2_RELRO_FULL is not set
|
||||
BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y
|
||||
BR2_FORTIFY_SOURCE_NONE=y
|
||||
# BR2_FORTIFY_SOURCE_1 is not set
|
||||
# BR2_FORTIFY_SOURCE_2 is not set
|
||||
@ -961,6 +962,10 @@ BR2_PACKAGE_SDL2=y
|
||||
# KMS/DRM video driver needs libdrm
|
||||
#
|
||||
|
||||
#
|
||||
# KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d
|
||||
#
|
||||
|
||||
#
|
||||
# OpenGL support needs X11 and an OpenGL provider
|
||||
#
|
||||
@ -2199,7 +2204,7 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y
|
||||
BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
|
||||
# BR2_PACKAGE_LAPACK is not set
|
||||
BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
|
||||
# BR2_PACKAGE_LIBABSEIL_CPP is not set
|
||||
BR2_PACKAGE_LIBABSEIL_CPP=y
|
||||
# BR2_PACKAGE_LIBARGTABLE2 is not set
|
||||
BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
|
||||
# BR2_PACKAGE_LIBATOMIC_OPS is not set
|
||||
@ -2306,7 +2311,7 @@ BR2_PACKAGE_PROTOBUF=y
|
||||
#
|
||||
# BR2_PACKAGE_AUGEAS is not set
|
||||
# BR2_PACKAGE_ENCHANT is not set
|
||||
# BR2_PACKAGE_FMT is not set
|
||||
BR2_PACKAGE_FMT=y
|
||||
# BR2_PACKAGE_FSTRCMP is not set
|
||||
# BR2_PACKAGE_ICU is not set
|
||||
# BR2_PACKAGE_INIH is not set
|
||||
|
@ -3,8 +3,8 @@ FROM dockcross/base:latest
|
||||
# This is for 64-bit x86 Linux machine
|
||||
|
||||
# Buildroot version
|
||||
# crosstool-ng master 2021-08-21
|
||||
ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
|
||||
# buildroot master 2021-08-30
|
||||
ENV BR_VERSION 2990d7dcb163a5618100a6985726b6820457a6d1
|
||||
|
||||
#include "common.buildroot"
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration
|
||||
# Buildroot 2021.08-rc2-75-g2990d7dcb1 Configuration
|
||||
#
|
||||
BR2_HAVE_DOT_CONFIG=y
|
||||
BR2_HOST_GCC_AT_LEAST_4_9=y
|
||||
@ -147,6 +147,7 @@ BR2_SSP_NONE=y
|
||||
BR2_RELRO_NONE=y
|
||||
# BR2_RELRO_PARTIAL is not set
|
||||
# BR2_RELRO_FULL is not set
|
||||
BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y
|
||||
BR2_FORTIFY_SOURCE_NONE=y
|
||||
# BR2_FORTIFY_SOURCE_1 is not set
|
||||
# BR2_FORTIFY_SOURCE_2 is not set
|
||||
@ -931,6 +932,10 @@ BR2_PACKAGE_SDL2=y
|
||||
# KMS/DRM video driver needs libdrm
|
||||
#
|
||||
|
||||
#
|
||||
# KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d
|
||||
#
|
||||
|
||||
#
|
||||
# OpenGL support needs X11 and an OpenGL provider
|
||||
#
|
||||
@ -2176,7 +2181,7 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y
|
||||
BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
|
||||
# BR2_PACKAGE_LAPACK is not set
|
||||
BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
|
||||
# BR2_PACKAGE_LIBABSEIL_CPP is not set
|
||||
BR2_PACKAGE_LIBABSEIL_CPP=y
|
||||
# BR2_PACKAGE_LIBARGTABLE2 is not set
|
||||
BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
|
||||
# BR2_PACKAGE_LIBATOMIC_OPS is not set
|
||||
@ -2284,7 +2289,7 @@ BR2_PACKAGE_PROTOBUF=y
|
||||
#
|
||||
# BR2_PACKAGE_AUGEAS is not set
|
||||
# BR2_PACKAGE_ENCHANT is not set
|
||||
# BR2_PACKAGE_FMT is not set
|
||||
BR2_PACKAGE_FMT=y
|
||||
# BR2_PACKAGE_FSTRCMP is not set
|
||||
# BR2_PACKAGE_ICU is not set
|
||||
# BR2_PACKAGE_INIH is not set
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM emscripten/emsdk:2.0.27
|
||||
FROM emscripten/emsdk:2.0.29
|
||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||
|
||||
# Revert back to "/bin/sh" as default shell
|
||||
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
|
||||
|
||||
#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 CC=/emsdk/upstream/emscripten/emcc \
|
||||
|
Reference in New Issue
Block a user