Skip to content

Commit f390d4e

Browse files
authored
refactor: project files structure (#15)
1 parent 2b82c30 commit f390d4e

File tree

10 files changed

+13
-14
lines changed

10 files changed

+13
-14
lines changed

.dockerignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
*
2-
!docker
2+
3+
!cargo
4+
!Dockerfile
35
!Makefile
6+
!scripts

.github/workflows/devel.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Cache Docker layers
1717
uses: mattes/cached-docker-build-action@v1
1818
with:
19-
args: "-t joseluisq/rust-linux-darwin-builder:latest -f docker/Dockerfile ."
19+
args: "-t joseluisq/rust-linux-darwin-builder:latest -f Dockerfile ."
2020
cache_key: "${{ hashFiles('**/lockfiles') }}"
2121
-
2222
name: Test cross-compile

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ jobs:
3737
with:
3838
push: true
3939
context: .
40-
file: docker/Dockerfile
40+
file: Dockerfile
4141
tags: ${{ steps.meta.outputs.tags }}

docker/Dockerfile Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ ENV PATH=/root/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/us
6767

6868
# Set up a `git credentials` helper for using GH_USER and GH_TOKEN to access
6969
# private repositories if desired.
70-
COPY docker/git-credential-ghtoken /usr/local/bin
70+
COPY scripts/git-credential-ghtoken /usr/local/bin
7171
RUN set -eux \
7272
&& git config --global credential.https://github.com.helper ghtoken \
7373
&& true
@@ -224,7 +224,7 @@ RUN set -eux \
224224
x86_64-apple-darwin \
225225
x86_64-unknown-linux-musl \
226226
&& true
227-
COPY docker/cargo-config.toml /root/.cargo/config
227+
COPY cargo/config.toml /root/.cargo/config
228228

229229
RUN set -eux \
230230
&& echo "Removing temp files..." \

LICENSE-MIT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2019-present Jose Quintana <https://git.io/joseluisq>
3+
Copyright (c) 2019-present Jose Quintana <https://github.com/joseluisq>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

Makefile

+2-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TAG ?= latest
55
build:
66
docker build \
77
-t $(REPOSITORY)/rust-linux-darwin-builder:$(TAG) \
8-
-f docker/Dockerfile .
8+
-f Dockerfile .
99
.PHONY: build
1010

1111

@@ -20,7 +20,7 @@ buildx:
2020
--platform linux/amd64,linux/arm64 \
2121
--push \
2222
-t $(REPOSITORY)/rust-linux-darwin-builder:$(TAG) \
23-
-f docker/Dockerfile .
23+
-f Dockerfile .
2424

2525
.PHONY: buildx
2626

@@ -79,7 +79,3 @@ test-ci:
7979
&& du -sh target/aarch64-apple-darwin/release/helloworld
8080

8181
.ONESHELL: test-ci
82-
83-
promote:
84-
@drone build promote joseluisq/rust-linux-darwin-builder $(BUILD) $(ENV)
85-
.PHONY: promote

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,4 @@ Feel free to send some [Pull request](https://github.com/joseluisq/rust-linux-da
182182

183183
This work is primarily distributed under the terms of both the [MIT license](LICENSE-MIT) and the [Apache License (Version 2.0)](LICENSE-APACHE).
184184

185-
© 2019-present [Jose Quintana](https://git.io/joseluisq)
185+
© 2019-present [Jose Quintana](https://github.com/joseluisq)
File renamed without changes.
File renamed without changes.

tests/hello-world/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "helloworld"
33
version = "0.0.0"
4-
authors = ["Jose Quintana <https://git.io/joseluisq>"]
4+
authors = ["Jose Quintana <https://github.com/joseluisq>"]
55
edition = "2018"
66

77
[dependencies]

0 commit comments

Comments
 (0)