Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature/771] Crystal v1 update #890

Merged
merged 4 commits into from
Aug 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
spec:
name: Crystal Specs
needs: [tests]
runs-on: [default]
runs-on: [v1.0.0]
strategy:
fail-fast: false
matrix: ${{fromJson(needs.tests.outputs.matrix)}}
Expand Down Expand Up @@ -183,8 +183,7 @@ jobs:
name: Build Release
runs-on: ubuntu-latest
env:
CRYSTAL_IMAGE: "conformance/crystal:0.35.1-llvm10-grep"
# if: needs.skip.outputs.skip == 'false'
CRYSTAL_IMAGE: "conformance/crystal:1.0.0-alpine-r1"
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -215,9 +214,9 @@ jobs:

setup_airgapped_env:
name: Test Setup Command In An Airgapped Env.
runs-on: [default]
runs-on: [v1.0.0]
env:
OFFLINE_IMAGE: "conformance/offline:latest"
OFFLINE_IMAGE: "conformance/offline:crystal-1.0.0-r1"
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -255,7 +254,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
run: |
export DIR=$(uuidgen)
export DIR=$(uuidgen)
echo "export DIR=$DIR" > dir.env
mkdir /shared/$DIR
#DOTO Use pre-created airgapped.tar.gz
Expand All @@ -278,9 +277,9 @@ jobs:

test_helm_chart_in_airgapped_env:
name: Test helm chart In An Airgapped Env.
runs-on: [default]
runs-on: [v1.0.0]
env:
OFFLINE_IMAGE: "conformance/offline:latest"
OFFLINE_IMAGE: "conformance/offline:crystal-1.0.0-r1"
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -350,9 +349,9 @@ jobs:

test_helm_directory_in_airgapped_env:
name: Test helm directory In An Airgapped Env.
runs-on: [default]
runs-on: [v1.0.0]
env:
OFFLINE_IMAGE: "conformance/offline:latest"
OFFLINE_IMAGE: "conformance/offline:crystal-1.0.0-r1"
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -420,9 +419,9 @@ jobs:

test_manifest_directory_in_airgapped_env:
name: Test manifest directory In An Airgapped Env.
runs-on: [default]
runs-on: [v1.0.0]
env:
OFFLINE_IMAGE: "conformance/offline:latest"
OFFLINE_IMAGE: "conformance/offline:crystal-1.0.0-r1"
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -490,7 +489,7 @@ jobs:

test_binary_configuration_lifecycle:
name: Test Binary Without Source(config_lifecycle)
runs-on: [default]
runs-on: [v1.0.0]
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -546,7 +545,7 @@ jobs:

test_binary_microservice:
name: Test Binary Without Source(microservice)
runs-on: [default]
runs-on: [v1.0.0]
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -598,7 +597,7 @@ jobs:

test_binary_all:
name: Test Binary Without Source(all)
runs-on: [default]
runs-on: [v1.0.0]
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
/tools/helm
/tools/sonobuoy
/tools/cluster-api
/tools/airgapped_kind/kind_node/node.tar.gz
admin.conf
cnf-testsuite
results.yml
Expand Down
22 changes: 11 additions & 11 deletions shard.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,41 @@ version: 2.0
shards:
ameba:
git: https://github.com/crystal-ameba/ameba.git
version: 0.12.1
version: 0.14.3

commander:
git: https://github.com/mrrooijen/commander.git
version: 0.3.5
version: 0.4.0

crinja:
git: https://github.com/straight-shoota/crinja.git
version: 0.6.1+git.commit.849bd8a3c9600256ef797db66315dd757a1686a0
version: 0.7.0

halite:
git: https://github.com/icyleaf/halite.git
version: 0.10.5+git.commit.ba22d2aa96bbb99702145839df8be516b4ceca90
version: 0.12.0

icr:
git: https://github.com/crystal-community/icr.git
version: 0.7.0+git.commit.7da354f5c0a356aee77e68fc63c87e2ad35da7fb
version: 0.8.0+git.commit.0537fc21636fc1de467fa7108d80387eeba06893

popcorn:
git: https://github.com/icyleaf/popcorn.git
version: 0.2.2
version: 0.3.0

readline:
git: https://github.com/crystal-lang/crystal-readline.git
version: 0.1.0+git.commit.0fb7d186da8e1b157998d98d1c96e99699b791eb
version: 0.1.0+git.commit.59183141b981bc36003bc818cfe7837f06989e31

retriable:
git: https://github.com/Sija/retriable.cr.git
version: 0.2.2
git: https://github.com/sija/retriable.cr.git
version: 0.2.4

sam:
git: https://github.com/vulk/sam.cr.git
version: 0.4.0+git.commit.c243db28c0825838c1851d75aaf9273460720625
version: 0.4.0+git.commit.4e3b271d31d7fd3c3ca2b0c1ff4943b86dc27021

totem:
git: https://github.com/icyleaf/totem.git
version: 0.6.0
version: 0.7.0

17 changes: 10 additions & 7 deletions shard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,36 @@ targets:
cnf_testsuite:
main: src/cnf_testsuite.cr

crystal: 0.35.1
crystal: '>= 0.35.1'

dependencies:
sam:
github: vulk/sam.cr
commit: c243db2
commit: 4e3b271d31d7
totem:
github: icyleaf/totem
version: 0.6.0
version: ~> 0.7.0
halite:
github: icyleaf/halite
commit: ba22d2aa96bbb99702145839df8be516b4ceca90 # master as of 7-29-2020
version: ~> 0.12.0

icr:
github: crystal-community/icr
branch: master

commander:
github: mrrooijen/commander
version: ~> 0.3.5
version: ~> 0.4.0
crinja:
github: straight-shoota/crinja
commit: 849bd8a3c9600256ef797db66315dd757a1686a0 # master as of 7-29-2020
version: ~> 0.7.0
retriable:
github: Sija/retriable.cr
version: ~> 0.2.4

development_dependencies:
ameba:
github: crystal-ameba/ameba
version: ~> 0.12.0
version: ~> 0.14.3

license: MIT
2 changes: 1 addition & 1 deletion src/tasks/utils/embedded_file_manager.cr
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "totem"
require "colorize"
require "logger"
require "log"
require "halite"

module EmbeddedFileManager
Expand Down
5 changes: 3 additions & 2 deletions tools/github-runner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM myoung34/github-runner:latest

ARG CRYSTAL_VERSION=0.35.1
ARG CRYSTAL_VERSION=1.0.0
ARG CRYSTAL_URL=https://github.com/crystal-lang/crystal/releases/download

RUN wget -O crystal.deb "$CRYSTAL_URL/$CRYSTAL_VERSION/crystal_$CRYSTAL_VERSION-1_amd64.deb" --progress=dot:giga && \
apt update && \
apt install -y --no-install-recommends \
git \
libssl-dev \
Expand Down Expand Up @@ -33,4 +34,4 @@ RUN curl -Lo ./kind "https://kind.sigs.k8s.io/dl/v0.11.1/kind-$(uname)-amd64" &&
chmod +x ./kind && \
mv ./kind /usr/local/bin