Skip to content

Commit c906884

Browse files
Merge branch 'master' into fix/add-log-path
2 parents 98d78ec + 4be4819 commit c906884

File tree

10 files changed

+364
-110
lines changed

10 files changed

+364
-110
lines changed

.circleci/config.yml

Lines changed: 15 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
version: 2.1
22

33
orbs:
4-
codacy: codacy/base@2.5.0
4+
codacy: codacy/base@12.2.0
55

66
# Re-usable blocks to reduce boilerplate in job definitions.
77
references:
88
default_machine_job: &default_machine_job
99
machine: true
1010
working_directory: ~/workdir
1111

12-
set_version_env_variable: &set_version_env_variable
13-
run:
14-
name: Define Environment Variable VERSION and ENV at Runtime
15-
command: |
16-
echo export VERSION=$(cat .version) >> $BASH_ENV
17-
source $BASH_ENV
18-
echo $VERSION
19-
2012
jobs:
2113
compile:
2214
<<: *default_machine_job
@@ -26,12 +18,12 @@ jobs:
2618
- run:
2719
name: Get version
2820
command: |
21+
curl -fsSL https://crystal-lang.org/install.sh | sudo bash
2922
sudo apt-get update
30-
sudo apt-get install libevent-core-2.0-5 libevent-dev libevent-extra-2.0-5 libevent-openssl-2.0-5 libevent-pthreads-2.0-5 libgmp-dev libgmpxx4ldbl libssl-dev libxml2-dev libyaml-dev libreadline-dev automake libtool git llvm libpcre3-dev build-essential -y
31-
wget https://github.com/crystal-lang/crystal/releases/download/0.30.1/crystal_0.30.1-1_amd64.deb
32-
sudo dpkg -i crystal_0.30.1-1_amd64.deb
33-
sudo make clean test build
23+
sudo apt-get install crystal
24+
make clean test build
3425
./bin/git-version > .version
26+
cat .version
3527
- persist_to_workspace:
3628
root: ~/workdir
3729
paths:
@@ -44,28 +36,20 @@ jobs:
4436
steps:
4537
- attach_workspace:
4638
at: ~/workdir
47-
- *set_version_env_variable
4839
- run:
4940
name: Build Docker image
5041
command: make docker_build
51-
- run:
52-
name: Save docker to file
53-
command: |
54-
docker save --output docker-image.tar codacy/git-version:$VERSION
55-
- persist_to_workspace:
56-
root: ~/workdir
57-
paths:
58-
- docker-image.tar
5942

6043
build_static:
6144
<<: *default_machine_job
6245
steps:
6346
- attach_workspace:
6447
at: ~/workdir
65-
- *set_version_env_variable
6648
- run:
67-
name: Compile
68-
command: make clean buildStatic
49+
name: Build Docker and extract from image
50+
command: |
51+
make docker_build
52+
docker run --entrypoint cat codacy/git-version:$(cat .version) /bin/git-version > bin/git-version
6953
- persist_to_workspace:
7054
root: ~/workdir
7155
paths:
@@ -75,14 +59,9 @@ jobs:
7559

7660
publish_versioned:
7761
<<: *default_machine_job
78-
environment:
79-
PROJECT_NAME: $CIRCLE_PROJECT_REPONAME
8062
steps:
8163
- attach_workspace:
8264
at: ~/workdir
83-
- run:
84-
name: Load docker from file
85-
command: docker load --input docker-image.tar
8665
- run:
8766
name: Publish images to Docker Hub
8867
command: make push-docker-image
@@ -92,10 +71,6 @@ jobs:
9271
steps:
9372
- attach_workspace:
9473
at: ~/workdir
95-
- *set_version_env_variable
96-
- run:
97-
name: Load docker from file
98-
command: docker load --input docker-image.tar
9974
- run:
10075
name: Publish latest image to Docker Hub
10176
command: make push-latest-docker-image
@@ -151,11 +126,13 @@ workflows:
151126
requires:
152127
- build_docker
153128
context: CodacyDocker
129+
- codacy/publish_s3:
130+
path: bin/git-version
131+
files: bin/git-version
132+
context: CodacyAWS
133+
requires:
134+
- build_static
154135
- publish_latest:
155136
requires:
156137
- publish_versioned
157138
context: CodacyDocker
158-
- codacy/tag_version:
159-
context: CodacyAWS
160-
requires:
161-
- publish_versioned

Dockerfile

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,25 @@
1-
FROM codacy/ci-base:2.0.0 AS builder
1+
FROM crystallang/crystal:1.6-alpine AS builder
22

3-
RUN apk add --update --no-cache --force-overwrite \
4-
openssl openssl-dev crystal shards g++ gc-dev \
5-
libc-dev libevent-dev libxml2-dev llvm llvm-dev \
6-
llvm-static make pcre-dev readline-dev \
7-
yaml-dev zlib-dev git
3+
RUN apk add --update --no-cache --force-overwrite git
84

9-
RUN git config --global user.email "[email protected]" && git config --global user.name "Codacy"
5+
RUN git config --global user.email "[email protected]" && git config --global user.name "Codacy"
106

117
RUN mkdir -p /workspace
128

139
WORKDIR /workspace
1410
COPY ./ /workspace
1511

16-
ENV ALPINE=1
12+
RUN make test buildStatic
1713

18-
RUN make test build
19-
20-
21-
22-
FROM codacy/ci-base:2.0.0
14+
FROM alpine:3.15
2315

2416
LABEL maintainer="[email protected]"
2517

26-
RUN apk add --update --no-cache --force-overwrite gc-dev pcre-dev libevent-dev git
18+
RUN apk add --update --no-cache git
2719

2820
COPY --from=builder /workspace/bin/git-version /bin
2921

30-
RUN mkdir -p /repo
22+
RUN mkdir -p /repo && git config --global --add safe.directory /repo
3123
VOLUME /repo
3224

3325
CMD ["/bin/git-version", "--folder=/repo"]

LICENSE

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
Copyright 2023 @ Codacy
179+
180+
Licensed under the Apache License, Version 2.0 (the "License");
181+
you may not use this file except in compliance with the License.
182+
You may obtain a copy of the License at
183+
184+
http://www.apache.org/licenses/LICENSE-2.0
185+
186+
Unless required by applicable law or agreed to in writing, software
187+
distributed under the License is distributed on an "AS IS" BASIS,
188+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
189+
See the License for the specific language governing permissions and
190+
limitations under the License.

Makefile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CRYSTAL?=$(shell which crystal)
22
CRYSTAL_FLAGS=--release
3-
CRYSTAL_STATIC_FLAGS=--static --no-debug
3+
CRYSTAL_STATIC_FLAGS=--static
44

5-
VERSION?=$(shell ./bin/git-version)
5+
VERSION?=$(shell cat .version)
66

77
all: fmt test build docker_build ## clean and produce target binary and docker image
88

@@ -21,13 +21,10 @@ build: ## compiles from crystal sources
2121
.PHONY: buildStatic
2222
buildStatic: ## compiles from crystal sources into static binary
2323
mkdir -p bin
24-
docker run --rm -it -v $(PWD):/app -w /app durosoft/crystal-alpine:latest crystal build $(CRYSTAL_FLAGS) $(CRYSTAL_STATIC_FLAGS) src/main.cr -o bin/git-version
25-
26-
.PHONY: docker
27-
docker: build docker_build ## compiles from sources and produce the docker image
24+
crystal build $(CRYSTAL_FLAGS) $(CRYSTAL_STATIC_FLAGS) src/main.cr -o bin/git-version
2825

2926
docker_build: ## build the docker image
30-
docker build -t codacy/git-version:${VERSION} .
27+
docker build -t codacy/git-version:$(VERSION) .
3128

3229
.PHONY: clean
3330
clean: ## clean target directories
@@ -36,12 +33,13 @@ clean: ## clean target directories
3633
.PHONY: push-docker-image
3734
push-docker-image: ## push the docker image to the registry (DOCKER_USER and DOCKER_PASS mandatory)
3835
@docker login -u $(DOCKER_USER) -p $(DOCKER_PASS) &&\
39-
docker push codacy/git-version:${VERSION}
36+
docker build -t codacy/git-version:$(VERSION) . &&\
37+
docker push codacy/git-version:$(VERSION)
4038

4139
.PHONY: push-latest-docker-image
4240
push-latest-docker-image: ## push the docker image with the "latest" tag to the registry (DOCKER_USER and DOCKER_PASS mandatory)
4341
@docker login -u $(DOCKER_USER) -p $(DOCKER_PASS) &&\
44-
docker tag codacy/git-version:${VERSION} codacy/git-version:latest &&\
42+
docker build -t codacy/git-version:latest . &&\
4543
docker push codacy/git-version:latest
4644

4745
.PHONY: help

0 commit comments

Comments
 (0)