Skip to content
Open

test #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
491 commits
Select commit Hold shift + click to select a range
cef9670
Update service.yaml
alina-codefresh Apr 3, 2023
30bfe99
Update version
alina-codefresh Apr 3, 2023
0d7b749
Merge pull request #76 from alina-codefresh/update-application-version
alina-codefresh Apr 3, 2023
e28eff7
Update service.yaml
alina-codefresh Apr 4, 2023
24f1378
Update version
alina-codefresh Apr 4, 2023
05b33ee
Merge pull request #77 from alina-codefresh/update-application-version
alina-codefresh Apr 4, 2023
3336c78
Update service.yaml
alina-codefresh Apr 5, 2023
eb1da4e
Update version
alina-codefresh Apr 5, 2023
8bfb3c1
Merge pull request #78 from alina-codefresh/update-application-version
alina-codefresh Apr 5, 2023
90b357e
Update service.yaml
alina-codefresh Apr 6, 2023
6481020
Update version
alina-codefresh Apr 6, 2023
3843d22
Merge pull request #79 from alina-codefresh/update-application-version
alina-codefresh Apr 6, 2023
620a3b1
Update service.yaml
alina-codefresh Apr 7, 2023
20c3ffb
Update version
alina-codefresh Apr 7, 2023
ca5a24c
Merge pull request #80 from alina-codefresh/update-application-version
alina-codefresh Apr 7, 2023
0fd9d11
Update service.yaml
alina-codefresh Apr 10, 2023
59c0a66
Update version
alina-codefresh Apr 10, 2023
3da7260
Merge pull request #81 from alina-codefresh/update-application-version
alina-codefresh Apr 10, 2023
1dd667d
Update service.yaml
alina-codefresh Apr 10, 2023
500da42
Update version
alina-codefresh Apr 10, 2023
4a9830a
Merge pull request #82 from alina-codefresh/update-application-version
alina-codefresh Apr 10, 2023
f78576e
Update service.yaml
alina-codefresh Apr 11, 2023
d439a26
Update version
alina-codefresh Apr 11, 2023
88158d0
Merge pull request #83 from alina-codefresh/update-application-version
alina-codefresh Apr 11, 2023
13cf200
Update service.yaml
alina-codefresh Apr 12, 2023
e5d70a8
Update version
alina-codefresh Apr 12, 2023
60aeb93
Merge pull request #84 from alina-codefresh/update-application-version
alina-codefresh Apr 12, 2023
b94d031
Update service.yaml
alina-codefresh Apr 13, 2023
b6da9a6
Update version
alina-codefresh Apr 13, 2023
def3bc4
Merge pull request #85 from alina-codefresh/update-application-version
alina-codefresh Apr 13, 2023
c98bb94
Update service.yaml
alina-codefresh Apr 14, 2023
6587671
Update version
alina-codefresh Apr 14, 2023
dc24c46
Merge pull request #86 from alina-codefresh/update-application-version
alina-codefresh Apr 14, 2023
1aa62d0
Update service.yaml
alina-codefresh Apr 18, 2023
f18a10c
Update version
alina-codefresh Apr 18, 2023
6ab1ec3
Merge pull request #87 from alina-codefresh/update-application-version
alina-codefresh Apr 18, 2023
c04bca1
Update service.yaml
alina-codefresh Apr 18, 2023
dea639a
Update version
alina-codefresh Apr 18, 2023
d356350
Merge pull request #88 from alina-codefresh/update-application-version
alina-codefresh Apr 18, 2023
31e042e
Update service.yaml
alina-codefresh Apr 19, 2023
391ace6
Update version
alina-codefresh Apr 19, 2023
3cfac56
Merge pull request #89 from alina-codefresh/update-application-version
alina-codefresh Apr 19, 2023
503a453
Update service.yaml
alina-codefresh Apr 20, 2023
3aca74c
Update version
alina-codefresh Apr 20, 2023
be21db8
Merge pull request #90 from alina-codefresh/update-application-version
alina-codefresh Apr 20, 2023
fbd41fe
Update service.yaml
alina-codefresh Apr 21, 2023
9d42442
Update version
alina-codefresh Apr 21, 2023
874a8e4
Merge pull request #91 from alina-codefresh/update-application-version
alina-codefresh Apr 21, 2023
007d004
Update service.yaml
alina-codefresh Apr 24, 2023
c53ce7f
Update service.yaml
alina-codefresh Apr 24, 2023
af42d7e
Update version
alina-codefresh Apr 24, 2023
dc58561
Merge pull request #92 from alina-codefresh/update-application-version
alina-codefresh Apr 24, 2023
9de586a
Update service.yaml
alina-codefresh Apr 25, 2023
4c75a20
Update version
alina-codefresh Apr 25, 2023
1e4bec7
Merge pull request #93 from alina-codefresh/update-application-version
alina-codefresh Apr 25, 2023
277c2a0
Update service.yaml
alina-codefresh Apr 26, 2023
fa77a75
Update version
alina-codefresh Apr 26, 2023
a309c44
Merge pull request #94 from alina-codefresh/update-application-version
alina-codefresh Apr 26, 2023
96c0eb6
Update service.yaml
alina-codefresh Apr 27, 2023
16cc5ea
Update version
alina-codefresh Apr 27, 2023
e9e4772
Merge pull request #95 from alina-codefresh/update-application-version
alina-codefresh Apr 27, 2023
def2cf4
Update service.yaml
alina-codefresh Apr 28, 2023
02bb6bc
Update version
alina-codefresh Apr 28, 2023
59b09e9
Merge pull request #96 from alina-codefresh/update-application-version
alina-codefresh Apr 28, 2023
2e435d3
Update service.yaml
alina-codefresh May 2, 2023
5cfd64d
Update version
alina-codefresh May 2, 2023
ee68fec
Merge pull request #97 from alina-codefresh/update-application-version
alina-codefresh May 2, 2023
a5dc3ac
Update service.yaml
alina-codefresh May 2, 2023
3a78087
Update version
alina-codefresh May 2, 2023
88aa116
Merge pull request #98 from alina-codefresh/update-application-version
alina-codefresh May 2, 2023
de4c7dd
Update service.yaml
alina-codefresh May 3, 2023
9927b2b
Update version
alina-codefresh May 3, 2023
accca5b
Merge pull request #99 from alina-codefresh/update-application-version
alina-codefresh May 3, 2023
5601405
Update service.yaml
alina-codefresh May 4, 2023
6a8d9af
Update version
alina-codefresh May 4, 2023
e6b80fa
Merge pull request #100 from alina-codefresh/update-application-version
alina-codefresh May 4, 2023
d88555b
Update service.yaml
alina-codefresh May 5, 2023
087b9d6
Update version
alina-codefresh May 5, 2023
d3554a6
Merge pull request #101 from alina-codefresh/update-application-version
alina-codefresh May 5, 2023
3bd3367
Update service.yaml
alina-codefresh May 7, 2023
a7f2b81
Update version
alina-codefresh May 7, 2023
dbfce99
Merge pull request #102 from alina-codefresh/update-application-version
alina-codefresh May 7, 2023
47acaab
Update service.yaml
alina-codefresh May 9, 2023
d454398
Update version
alina-codefresh May 9, 2023
8143aa8
Merge pull request #103 from alina-codefresh/update-application-version
alina-codefresh May 9, 2023
eb5db27
Update service.yaml
alina-codefresh May 9, 2023
305aef8
Update version
alina-codefresh May 9, 2023
e703d0f
Merge pull request #104 from alina-codefresh/update-application-version
alina-codefresh May 9, 2023
d3eebdb
Update service.yaml
alina-codefresh May 11, 2023
598113f
Update version
alina-codefresh May 11, 2023
1782f3c
Merge pull request #105 from alina-codefresh/update-application-version
alina-codefresh May 11, 2023
312f39f
Update service.yaml
alina-codefresh May 12, 2023
e5e8887
Update version
alina-codefresh May 12, 2023
a3868aa
Merge pull request #106 from alina-codefresh/update-application-version
alina-codefresh May 12, 2023
ef81256
Update service.yaml
alina-codefresh May 15, 2023
a0e8888
Update version
alina-codefresh May 15, 2023
42e3d06
Merge pull request #107 from alina-codefresh/update-application-version
alina-codefresh May 15, 2023
528a539
Update service.yaml
alina-codefresh May 16, 2023
f88a1a2
Update version
alina-codefresh May 16, 2023
5cade8c
Merge pull request #108 from alina-codefresh/update-application-version
alina-codefresh May 16, 2023
261827d
Update service.yaml
alina-codefresh May 17, 2023
48c6b13
Update version
alina-codefresh May 17, 2023
82edcdb
Merge pull request #109 from alina-codefresh/update-application-version
alina-codefresh May 17, 2023
e1bac17
Update service.yaml
alina-codefresh May 18, 2023
cad5c21
Update version
alina-codefresh May 18, 2023
5c41e38
Merge pull request #110 from alina-codefresh/update-application-version
alina-codefresh May 18, 2023
37684f0
Update service.yaml
alina-codefresh May 21, 2023
dd8cb70
Update version
alina-codefresh May 21, 2023
5bc339a
Merge pull request #111 from alina-codefresh/update-application-version
alina-codefresh May 21, 2023
f6b4fa3
Update service.yaml
alina-codefresh May 22, 2023
093b30b
Update version
alina-codefresh May 22, 2023
ca998f6
Merge pull request #112 from alina-codefresh/update-application-version
alina-codefresh May 22, 2023
4672861
Update service.yaml
alina-codefresh May 23, 2023
8d2a104
Update version
alina-codefresh May 23, 2023
9ca8504
Merge pull request #113 from alina-codefresh/update-application-version
alina-codefresh May 23, 2023
d5c77b9
Update service.yaml
alina-codefresh May 24, 2023
b62654a
Update version
alina-codefresh May 24, 2023
66f2327
Merge pull request #114 from alina-codefresh/update-application-version
alina-codefresh May 24, 2023
fff0f4d
Update service.yaml
alina-codefresh May 26, 2023
96cfe15
Update version
alina-codefresh May 26, 2023
cc98a0d
Merge pull request #115 from alina-codefresh/update-application-version
alina-codefresh May 26, 2023
1c853bb
Update service.yaml
alina-codefresh May 26, 2023
cee0b02
Update version
alina-codefresh May 26, 2023
4ec4be3
Merge pull request #116 from alina-codefresh/update-application-version
alina-codefresh May 26, 2023
4c5d94f
Update service.yaml
alina-codefresh May 29, 2023
c94bf13
Update version
alina-codefresh May 29, 2023
82f0def
Merge pull request #117 from alina-codefresh/update-application-version
alina-codefresh May 29, 2023
b0add53
Update service.yaml
alina-codefresh May 31, 2023
29872d9
Update ci.yml
alina-codefresh May 31, 2023
c11a3a8
Update version
alina-codefresh May 31, 2023
111af10
Merge pull request #120 from alina-codefresh/update-application-version
alina-codefresh May 31, 2023
3008c73
Update ci.yml
alina-codefresh Jun 1, 2023
93bc338
Update service.yaml
alina-codefresh Jun 1, 2023
f52abe6
Update version
alina-codefresh Jun 1, 2023
c7d36d5
Merge pull request #121 from alina-codefresh/update-application-version
alina-codefresh Jun 1, 2023
7297909
Update service.yaml
alina-codefresh Jun 9, 2023
7b8ad93
Update version
alina-codefresh Jun 9, 2023
b401193
Merge pull request #122 from alina-codefresh/update-application-version
alina-codefresh Jun 9, 2023
5046201
Update service.yaml
alina-codefresh Jun 17, 2023
b934f62
Update version
alina-codefresh Jun 17, 2023
5b22c9a
Merge pull request #123 from alina-codefresh/update-application-version
alina-codefresh Jun 17, 2023
275da2b
Update service.yaml
alina-codefresh Jun 19, 2023
62df27c
Update version
alina-codefresh Jun 19, 2023
780fa80
Merge pull request #124 from alina-codefresh/update-application-version
alina-codefresh Jun 19, 2023
a91f5fe
Update service.yaml
alina-codefresh Jun 20, 2023
5dc8963
Update version
alina-codefresh Jun 20, 2023
a56327e
Merge pull request #125 from alina-codefresh/update-application-version
alina-codefresh Jun 20, 2023
d41a18f
Update service.yaml
alina-codefresh Jul 3, 2023
46d5e91
Update service.yaml
alina-codefresh Jul 6, 2023
d1cefec
Update version
alina-codefresh Jul 6, 2023
ec8ac93
Merge pull request #126 from alina-codefresh/update-application-version
alina-codefresh Jul 6, 2023
439242f
Update service.yaml
alina-codefresh Jul 10, 2023
4389a9c
Update version
alina-codefresh Jul 10, 2023
89b9e35
Merge pull request #127 from alina-codefresh/update-application-version
alina-codefresh Jul 10, 2023
719dc6a
Update service.yaml
alina-codefresh Jul 17, 2023
94220fa
Update version
alina-codefresh Jul 17, 2023
e8d035b
Merge pull request #128 from alina-codefresh/update-application-version
alina-codefresh Jul 17, 2023
6988802
Update service.yaml
alina-codefresh Jul 21, 2023
71e7277
Update version
alina-codefresh Jul 21, 2023
9a7c6a4
Merge pull request #129 from alina-codefresh/update-application-version
alina-codefresh Jul 21, 2023
0eb6c64
Update service.yaml
alina-codefresh Jul 28, 2023
23931b0
Update version
alina-codefresh Jul 28, 2023
c17f85a
Merge pull request #130 from alina-codefresh/update-application-version
alina-codefresh Jul 28, 2023
7ba7474
Update service.yaml
alina-codefresh Jul 31, 2023
f5ad4bb
Update version
alina-codefresh Jul 31, 2023
06322e6
Merge pull request #131 from alina-codefresh/update-application-version
alina-codefresh Jul 31, 2023
12121bc
Update service.yaml
alina-codefresh Aug 1, 2023
4900bc6
Update version
alina-codefresh Aug 1, 2023
0f90996
Merge pull request #132 from alina-codefresh/update-application-version
alina-codefresh Aug 1, 2023
99c6d7e
Update service.yaml
alina-codefresh Aug 2, 2023
594cddd
Update version
alina-codefresh Aug 2, 2023
c541fa8
Merge pull request #133 from alina-codefresh/update-application-version
alina-codefresh Aug 2, 2023
c27db92
Update service.yaml
alina-codefresh Aug 3, 2023
6192a7a
Update version
alina-codefresh Aug 3, 2023
f47521c
Merge pull request #134 from alina-codefresh/update-application-version
alina-codefresh Aug 3, 2023
e7fe0f5
Update service.yaml
alina-codefresh Aug 4, 2023
d1718cb
Update version
alina-codefresh Aug 4, 2023
ac1b8c1
Merge pull request #135 from alina-codefresh/update-application-version
alina-codefresh Aug 4, 2023
f122249
Update service.yaml
alina-codefresh Aug 7, 2023
51591a1
Update version
alina-codefresh Aug 7, 2023
5c3b131
Merge pull request #136 from alina-codefresh/update-application-version
alina-codefresh Aug 7, 2023
12282c8
Update service.yaml
alina-codefresh Aug 8, 2023
4079d6e
Update version
alina-codefresh Aug 8, 2023
f69f5a9
Merge pull request #137 from alina-codefresh/update-application-version
alina-codefresh Aug 8, 2023
0eb0738
Update service.yaml
alina-codefresh Aug 10, 2023
b442ec3
Update version
alina-codefresh Aug 10, 2023
f4768e0
Merge pull request #138 from alina-codefresh/update-application-version
alina-codefresh Aug 10, 2023
d29af29
Update service.yaml
alina-codefresh Aug 14, 2023
d272855
Update version
alina-codefresh Aug 14, 2023
1fdbfa4
Merge pull request #139 from alina-codefresh/update-application-version
alina-codefresh Aug 14, 2023
1b5989b
Update service.yaml
alina-codefresh Aug 14, 2023
3fe8eca
Update version
alina-codefresh Aug 14, 2023
c8c61a4
Merge pull request #140 from alina-codefresh/update-application-version
alina-codefresh Aug 14, 2023
52a6fb0
Update service.yaml
alina-codefresh Aug 23, 2023
af226e0
Update service.yaml
alina-codefresh Aug 23, 2023
783dde6
Update ci.yml
alina-codefresh Aug 23, 2023
057d051
Update service.yaml
alina-codefresh Aug 23, 2023
449a3c7
Update version
alina-codefresh Aug 23, 2023
a38215a
Merge pull request #141 from alina-codefresh/update-application-version
alina-codefresh Aug 23, 2023
6da1a84
Update ci.yml
alina-codefresh Aug 23, 2023
ca462f6
Update service.yaml
alina-codefresh Aug 23, 2023
5a96eab
Update version
alina-codefresh Aug 23, 2023
c1d0bb7
Merge pull request #142 from alina-codefresh/update-application-version
alina-codefresh Aug 23, 2023
6f229b6
Update ci.yml
alina-codefresh Sep 3, 2023
41bff62
Update service.yaml
alina-codefresh Sep 3, 2023
bad0aaa
Update service.yaml
alina-codefresh Sep 3, 2023
c83d4ad
Update version
alina-codefresh Sep 3, 2023
317e6f3
Merge pull request #143 from alina-codefresh/update-application-version
alina-codefresh Sep 3, 2023
ed965bd
Update ci.yml
alina-codefresh Sep 6, 2023
2b4d7e2
Update service.yaml
alina-codefresh Sep 6, 2023
b517d8f
Update version
alina-codefresh Sep 6, 2023
20bd576
Merge pull request #144 from alina-codefresh/update-application-version
alina-codefresh Sep 6, 2023
811a46c
Update service.yaml
alina-codefresh Sep 21, 2023
9a3d79d
Update ci.yml
alina-codefresh Sep 21, 2023
3b4146d
Update ci.yml
alina-codefresh Sep 21, 2023
6d7c9c7
Update ci.yml
alina-codefresh Sep 21, 2023
6c58a28
Update service.yaml
alina-codefresh Sep 21, 2023
934d1e7
Update version
alina-codefresh Sep 21, 2023
18fc86f
Merge pull request #145 from alina-codefresh/update-application-version
alina-codefresh Sep 21, 2023
35084d2
Update service.yaml
alina-codefresh Dec 8, 2023
c3d93b4
Update ci.yml
alina-codefresh Dec 8, 2023
69d3d9e
Update ci.yml
alina-codefresh Dec 8, 2023
1c6f881
Update service.yaml
alina-codefresh Dec 8, 2023
18949aa
Update version
alina-codefresh Dec 8, 2023
a29d619
Merge pull request #147 from alina-codefresh/update-application-version
alina-codefresh Dec 8, 2023
8532ded
Update service.yaml
alina-codefresh Dec 8, 2023
e5c0fd7
Update version
alina-codefresh Dec 8, 2023
93ccc91
Merge pull request #148 from alina-codefresh/update-application-version
alina-codefresh Dec 8, 2023
0274043
Update ci.yml
alina-codefresh Dec 20, 2023
0394dea
Update service.yaml
alina-codefresh Dec 20, 2023
3be24fd
Update version
alina-codefresh Dec 20, 2023
d535503
Merge pull request #149 from alina-codefresh/update-application-version
alina-codefresh Dec 20, 2023
702c08f
Update ci.yml
alina-codefresh Jan 17, 2024
028f5c0
Update ci.yml
alina-codefresh Jan 17, 2024
03c0bd2
Update service.yaml
alina-codefresh Jan 17, 2024
83a0647
Update version
alina-codefresh Jan 17, 2024
421441f
Merge pull request #150 from alina-codefresh/update-application-version
alina-codefresh Jan 17, 2024
25de27f
Update canary-rollout.yaml
alina-codefresh Jan 30, 2024
894083c
Update canary-rollout.yaml
alina-codefresh Jan 30, 2024
4de33f2
Update ci.yml
alina-codefresh Mar 20, 2024
b279fd8
Update service.yaml
alina-codefresh Mar 20, 2024
91fe6cd
Update version
alina-codefresh Mar 20, 2024
658b0ea
Merge pull request #151 from alina-codefresh/update-application-version
alina-codefresh Mar 20, 2024
77e0ed8
Update ci.yml
alina-codefresh Mar 28, 2024
b9a6127
Update ci.yml
alina-codefresh Mar 28, 2024
38c19d3
Update ci.yml
alina-codefresh Mar 28, 2024
7c3a1f1
Update service.yaml
alina-codefresh Jun 4, 2024
0c9241f
Update ci.yml
alina-codefresh Jun 4, 2024
7e74599
Update ci.yml
alina-codefresh Jun 4, 2024
212e774
Update ci.yml
alina-codefresh Jun 25, 2024
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
24 changes: 19 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Github-action-demo
on:
pull_request:
branches:
- master
- 1.23k8s
types:
- closed
push:
branches:
- master
- 1.23k8s

jobs:
build:
Expand All @@ -35,11 +35,25 @@ jobs:
- name: report image
with:
# Runtime to use for the enrichment.
CF_RUNTIME_NAME: 'codefresh-hosted'
CF_RUNTIME_NAME: 'test-date'

# CF_PLATFORM_URL: https://app-staging.codefresh.io
# CF_API_KEY: ${{secrets.CF_API_KEY_STAGING}}

# CF_PLATFORM_URL: 'https://pre-prod.codefresh.io'
# CF_API_KEY: ${{secrets.CF_API_KEY}}
# CF_API_KEY: ${{secrets.CF_API_KEY_TEST}}
# CF_API_KEY: ${{secrets.CF_API_KEY_FREE}}
# CF_API_KEY: ${{secrets.CF_API_KEY_PRE_PROD}}

# CF_RUNTIME_NAME: 'codefresh-onprem'
CF_PLATFORM_URL: 'https://hermes-onprem-test.cf-op.com'
CF_API_KEY: ${{secrets.CF_API_KEY_ONPREM}}

# API key for authentication to Codefresh. !! Committing a plain text token is a security risk. We highly recommend using encrypted secrets. !!
# Documentation - https://docs.github.com/en/actions/security-guides/encrypted-secrets
CF_API_KEY: ${{secrets.CF_API_KEY}}



# Image reported and enriched in Codefresh. Pass the [account-name]/[image-name]:[tag] built in your CI.
CF_IMAGE: ${{env.CF_IMAGE}}
Expand Down Expand Up @@ -67,7 +81,7 @@ jobs:
- name: Checkout csdp-salesdemo_applications
uses: actions/checkout@v3
with:
repository: PiBog/rollouts-demo # change to real repo
repository: alina-codefresh/rollouts-demo # change to real repo
path: .
- name: Update application version
run: |
Expand Down
11 changes: 7 additions & 4 deletions canary-rollout/canary-ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: canary-demo
Expand All @@ -8,10 +8,13 @@ metadata:
ingress.kubernetes.io/app-root: /
spec:
rules:
- host: mr-solo-company-59ac69a.cf-cd.com
- host: canary.dev.argoproj.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: canary-demo
servicePort: 80
service:
name: canary-demo
port:
number: 80
9 changes: 6 additions & 3 deletions canary-rollout/canary-preview-ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: canary-demo-preview
Expand All @@ -12,6 +12,9 @@ spec:
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: canary-demo-preview
servicePort: 80
service:
name: canary-demo-preview
port:
number: 80
4 changes: 2 additions & 2 deletions canary-rollout/canary-rollout.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: canary-demo
image: boblinger/rollouts-demo:red
image: alina1test/rollouts-demo:blue
imagePullPolicy: Always
ports:
- name: http
Expand All @@ -27,7 +27,7 @@ spec:
cpu: 5m
strategy:
canary:
canaryService: canary-demo-preview
#canaryService: canary-demo-preview
steps:
- setWeight: 20
- pause: {duration: 10}
Expand Down
2 changes: 1 addition & 1 deletion service.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
red
green