Skip to content

Commit

Permalink
Merge 3bafc03 into c1a8460
Browse files Browse the repository at this point in the history
  • Loading branch information
srz-zumix committed Nov 2, 2020
2 parents c1a8460 + 3bafc03 commit 52d1940
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 4 deletions.
1 change: 1 addition & 0 deletions .ci/drone/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Dockerconfig.json
15 changes: 15 additions & 0 deletions .ci/drone/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#
# help
#
help: ## show help
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sed -e 's/^GNUmakefile://' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'

#
# Add Secrets
# Dockerconfig.json : Dockerhub login auth
# https://docs.drone.io/pipeline/docker/syntax/images/#pulling-private-images
#
setup: ## setup drone.io configuration
drone secret add --repository srz-zumix/iutest \
--name dockerconfig \
--data @./Dockerconfig.json
3 changes: 3 additions & 0 deletions .ci/login-dockerhub.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

docker login --username "$1" --password-stdin
17 changes: 17 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ aliases:
MAKE_RUN_TARGET: test
# MAKE_TARGET: all_tests
# MAKE_RUN_TARGET: run_all_tests
auth:
username: srzzumix
password: $DOCKERHUB_TOKEN
- &restore_cache
keys:
# This branch if available
Expand Down Expand Up @@ -113,6 +116,7 @@ aliases:

orbs:
win: circleci/windows@2.2.0
docker: circleci/docker@1.4.0

jobs:
gcc_optimize_test:
Expand Down Expand Up @@ -158,6 +162,18 @@ jobs:
command: .circleci\vcperf_build.bat
- store_artifacts:
path: .\iutest.etl
docker_tests:
machine: true
steps:
- docker/check:
docker-username: srzzumix # DOCKER_LOGIN がデフォルト値となっており、この値が存在する場合自動で値がセットされます
docker-password: DOCKERHUB_TOKEN # DOCKER_PASSWORD がデフォルト値になっております
- run:
name: login check
command: |
echo a | docker login
- docker/pull:
images: 'madduci/docker-wine-msvc:16.7-2019'

workflows:
version: 2.1
Expand All @@ -168,3 +184,4 @@ workflows:
- clang_optimize_test:
filters: *branch-filter
- vcperf
- docker_tests
1 change: 0 additions & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,3 @@ cirrus_freebsd_clang_test_task:
build_script: gmake -C test -j4
test_script : gmake -C test test
report_script: gmake -C test report

15 changes: 15 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ trigger:
- master
- develop

image_pull_secrets:
- dockerconfig

steps:
- &gcc
name: 10
Expand Down Expand Up @@ -51,6 +54,9 @@ trigger:
- master
- develop

image_pull_secrets:
- dockerconfig

steps:
- &gcc
name: 5.5
Expand Down Expand Up @@ -109,6 +115,9 @@ trigger:
- master
- develop

image_pull_secrets:
- dockerconfig

steps:
- &clang
name: 11
Expand Down Expand Up @@ -162,6 +171,9 @@ trigger:
- master
- develop

image_pull_secrets:
- dockerconfig

steps:
- &clang
name: 3.9
Expand Down Expand Up @@ -241,6 +253,9 @@ trigger:
- master
- develop

image_pull_secrets:
- dockerconfig

steps:
- &gcc
name: gcc-10-c++98
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ jobs:
- run: |
echo "${{ github.event.head_commit.message }}"
login:
runs-on: ubuntu-latest
needs: prepare
steps:
-
name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

llvm-basic-test:
runs-on: windows-latest
needs: prepare
Expand Down Expand Up @@ -66,7 +77,7 @@ jobs:
zapcc-basic-test:
runs-on: ubuntu-18.04
container: docker://srzzumix/zapcc:bionic
needs: prepare
needs: login
env:
PYTHON_VERSION: 3.8
steps:
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,20 @@ jobs:
-d "{\"branch\": \"${GITHUB_REF#refs/heads/}\", \"commit\": \"${GITHUB_SHA}\", \"size\": \"${{ steps.fused.outputs.size }}\", \"min\": \"${{ steps.fused.outputs.min_size }}\", \"wandbox\": \"${{ steps.fused.outputs.wandbox_min_size }}\"}" \
${{ secrets.FUSED_METRICS_WEBHOOK }}
login:
runs-on: ubuntu-latest
needs: prepare
steps:
-
name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

lizard:
runs-on: ubuntu-18.04
needs: prepare
needs: login
steps:
- uses: actions/checkout@v2
- name: Lizard
Expand Down
4 changes: 4 additions & 0 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ global_job_config:
commands:
# - checkout --use-cache
- checkout
# Connect secret to all jobs in the pipeline
secrets:
- name: dockerhub_login

blocks:
# - name: install
Expand All @@ -44,6 +47,7 @@ blocks:
prologue:
commands:
# - cache restore
- echo ${DOCKER_PASSWORD} ./.ci/login-dockerhub.sh ${DOCKER_USERNAME}
- ./.ci/linux/install-clang.sh
- ./.ci/linux/install-gcc.sh
jobs:
Expand Down
4 changes: 3 additions & 1 deletion buddy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
- action: "Execute: sample run"
type: "BUILD"
working_directory: "/buddy/iutest"
login: "srzzumix"
password: "secure!Ni4QuDa4mUt/ypKs5YyEVwa8F2FiDqkIQIf8DYNsoXRLNWymxgpy8JthX0DeVKHt.0gDfE0ETdFk6vGc93v7lag=="
docker_image_name: "library/gcc"
docker_image_tag: "7"
docker_image_tag: "10"
execute_commands:
- "cd projects/make && make run"
mount_filesystem_path: "/buddy/iutest"
Expand Down

0 comments on commit 52d1940

Please sign in to comment.