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

issue152 - Fix CI so it can be required #169

Merged
merged 43 commits into from
Dec 26, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ab02746
Update config.yml
isuPatches Dec 26, 2022
b55a827
Update config.yml
isuPatches Dec 26, 2022
6bb741e
Update config.yml
isuPatches Dec 26, 2022
f036857
Update config.yml
isuPatches Dec 26, 2022
23b6895
Remove debug signing
isuPatches Dec 26, 2022
79bc3cf
Testing
isuPatches Dec 26, 2022
c8fc727
Create .keep
isuPatches Dec 26, 2022
edf950f
Update config.yml
isuPatches Dec 26, 2022
5ca5b2b
Update config.yml
isuPatches Dec 26, 2022
413c54a
Update BuildVersions.kt
isuPatches Dec 26, 2022
f9e9211
Publish to maven local for CI
isuPatches Dec 26, 2022
53a1f12
GPG Key adjustments
isuPatches Dec 26, 2022
dd7d98d
Update config.yml
isuPatches Dec 26, 2022
7981f2a
Update config.yml
isuPatches Dec 26, 2022
6616114
Update config.yml
isuPatches Dec 26, 2022
c02bc69
Update config.yml
isuPatches Dec 26, 2022
fb5d796
Update config.yml
isuPatches Dec 26, 2022
309a5c1
Not signing on CI
isuPatches Dec 26, 2022
1314c16
Update config.yml
isuPatches Dec 26, 2022
e945dd1
Update config.yml
isuPatches Dec 26, 2022
6d6b7f3
Update config.yml
isuPatches Dec 26, 2022
b2e7fbf
Test
isuPatches Dec 26, 2022
8c398fa
Update config.yml
isuPatches Dec 26, 2022
e1b180c
Update config.yml
isuPatches Dec 26, 2022
8fb773d
Update config.yml
isuPatches Dec 26, 2022
48d0651
Update config.yml
isuPatches Dec 26, 2022
0c9b87a
Update config.yml
isuPatches Dec 26, 2022
fda6b95
Update config.yml
isuPatches Dec 26, 2022
6d7e8b3
Update config.yml
isuPatches Dec 26, 2022
749c48c
Update config.yml
isuPatches Dec 26, 2022
5ec3eea
Update config.yml
isuPatches Dec 26, 2022
4aa7cee
Update config.yml
isuPatches Dec 26, 2022
655da1b
Sanity check
isuPatches Dec 26, 2022
5e932ca
Testing...
isuPatches Dec 26, 2022
b274383
Update PublishingPlugin.kt
isuPatches Dec 26, 2022
89c157c
Update config.yml
isuPatches Dec 26, 2022
0ff081a
Update config.yml
isuPatches Dec 26, 2022
2dc14e7
Update config.yml
isuPatches Dec 26, 2022
8de73b4
Update config.yml
isuPatches Dec 26, 2022
a54c3c3
Update config.yml
isuPatches Dec 26, 2022
6575cab
Update config.yml
isuPatches Dec 26, 2022
1a6b7bc
TEst
isuPatches Dec 26, 2022
b1e27d5
Simplify life
isuPatches Dec 26, 2022
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
Prev Previous commit
Next Next commit
Test
  • Loading branch information
isuPatches committed Dec 26, 2022
commit b2e7fbf15ab75efa36fac32f2f2240077d6e1038
28 changes: 17 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ commands:
- run:
name: Write Wisefy sample release keystore
command: echo "$WISEFY_SAMPLE_RELEASE_KEYSTORE" | base64 --decode > keystores/wisefy-sample-release.jks
import-gpg-key:
steps:
- run:
name: Write Wisefy GPG Key
command: echo -e "$GPG_KEY" > wisefy-gpg-key.asc
- run:
name: Import GPG Key
command: gpg --import wisefy-gpg-key.asc
- run:
name: Decrpyt secrets
command: gpg --no-tty --batch --passphrase "$GPG_PASSPHRASE" --pinentry-mode loopback --output secrets.env --decrypt wisefy-gpg-key.asc
publish-to-maven-local:
steps:
- run:
Expand Down Expand Up @@ -49,12 +60,13 @@ commands:
command: ./gradlew wisefy:ktx:publishToMavenLocal

jobs:
static-analysis:
build-and-test:
executor:
name: android/android-machine
steps:
- checkout
- write-keystore-files
- import-gpg-key
- publish-to-maven-local
- run:
name: Run lint
Expand All @@ -68,20 +80,14 @@ jobs:
- run:
name: Run CPD
command: ./gradlew cpdCheck

build:
executor:
name: android/android-machine
steps:
- checkout
- write-keystore-files
- publish-to-maven-local
- run:
name: Assemble debug build
command: ./gradlew assembleDebug
- run:
name: Assemble release build
command: ./gradlew assembleRelease

workflows:
wisefy-ci-cd:
jobs:
- static-analysis
- build
- build-and-test
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ class PublishingPlugin : Plugin<Project> {
publishing {
singleVariant("debug") {
withSourcesJar()
withJavadocJar()
}

singleVariant("release") {
Expand Down Expand Up @@ -179,9 +178,7 @@ class PublishingPlugin : Plugin<Project> {
System.getenv("SIGNING_KEY") ?: localProperties["signing.key"].toString(),
System.getenv("SIGNING_PASSWORD") ?: localProperties["signing.password"].toString(),
)
if (System.getenv("IS_CIRCLE_CI") == null) {
sign(publications)
}
sign(publications)
}
}
}
Expand Down