diff --git a/Jenkinsfile b/Jenkinsfile index e958ca7..0241cd8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,13 +70,13 @@ ANDROID_HOME: '/opt/android/sdk', GRADLE_USER_HOME: '/opt/android/gradle', GRADLE_OPTS: '-XX:MaxMetaspaceSize=256m -Xmx1792m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -Dme.jenkins -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy=in-process', - ANDROID_KEYALIAS: 'signing', + ANDROID_KEYALIAS: 'upload', ANDROID_KEYSTORE_CID: 'dummy-android', GOOGLE_API_CID: 'dappre-google-api', FIREBASE_API_CID: 'dappre-firebase-api', FIREBASE_GROUPS: 'dev', ], - noIndex: '(.+_.+|master|production)', // Avoid automatic indexing for release and private branches + noIndex: '(.+_.+|master|acceptance|production)', // Avoid automatic indexing for release and private branches xmppTargets: 'noise@conference.qiy.nl', ) diff --git a/app/build.gradle b/app/build.gradle index aeb9e71..bead12f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ applicationId "net.dolden.dummyand" minSdkVersion build_versions.min_sdk targetSdkVersion build_versions.target_sdk - versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 85 + versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 86 versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.6" vectorDrawables.useSupportLibrary true multiDexEnabled true diff --git a/fastlane/metadata/android/en-US/changelogs/87.txt b/fastlane/metadata/android/en-US/changelogs/87.txt new file mode 100644 index 0000000..ed3b331 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/87.txt @@ -0,0 +1,3 @@ +- Switch to new signing key - reinstall needed +- Nothing else visible +- Update base image to CentOS 7.8 diff --git a/fastlane/metadata/android/nl-NL/changelogs/87.txt b/fastlane/metadata/android/nl-NL/changelogs/87.txt new file mode 100644 index 0000000..0274f99 --- /dev/null +++ b/fastlane/metadata/android/nl-NL/changelogs/87.txt @@ -0,0 +1,3 @@ +- Wisselen nieuwe specifiek sleutel - reinstall nodig +- Niets anders zichtbaar +- Bijwerken base image met CentOS 7.8 diff --git a/lazyDir/centos7.Dockerfile b/lazyDir/centos7.Dockerfile index da1ff9d..75d1e0d 100644 --- a/lazyDir/centos7.Dockerfile +++ b/lazyDir/centos7.Dockerfile @@ -23,18 +23,20 @@ # Import local GPG keys and enable epel repo RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \ yum -q clean expire-cache && \ - yum -q -y update && \ - yum -y install --setopt=tsflags=nodocs epel-release && \ + yum -q makecache && \ + yum -y install --setopt=tsflags=nodocs \ + epel-release \ + && \ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 && \ yum -q -y clean all --enablerepo='*' # Install common requirements RUN yum -q clean expire-cache && \ - yum -q -y update && \ + yum -q makecache && \ yum -y install --setopt=tsflags=nodocs \ git \ - wget \ unzip \ + wget \ which \ && \ yum -q -y clean all --enablerepo='*' @@ -44,9 +46,14 @@ rpm --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs && \ rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB +# Add internal CA +RUN wget -q https://share.qiy.nl/public/certs/ca-digital-me-private-2026.crt -O /etc/pki/ca-trust/source/anchors/ca-digital-me-internal.pem && \ + update-ca-trust force-enable && \ + update-ca-trust extract + # Enable Software Collections RUN yum -q clean expire-cache && \ - yum -q -y update && \ + yum -q makecache && \ yum -y install --setopt=tsflags=nodocs \ centos-release-scl \ scl-utils-build \ @@ -56,19 +63,19 @@ # Install Ruby 2.6 from SCLO repo RUN yum -q clean expire-cache && \ - yum -q -y update && \ + yum -q makecache && \ yum -y install --setopt=tsflags=nodocs \ rh-ruby26-ruby \ - rh-ruby26-ruby-libs \ rh-ruby26-ruby-devel \ - rh-ruby26-rubygems \ + rh-ruby26-ruby-libs \ rh-ruby26-rubygem-bundler \ + rh-ruby26-rubygems \ && \ yum -q -y clean all --enablerepo='*' # Install extra dev tools RUN yum -q clean expire-cache && \ - yum -q -y update && \ + yum -q makecache && \ yum -y install --setopt=tsflags=nodocs \ gcc \ gcc-c++ \ @@ -79,7 +86,7 @@ # Install NodeJS 10 from SCLO repo RUN yum -q clean expire-cache && \ - yum -q -y update && \ + yum -q makecache && \ yum -y install --setopt=tsflags=nodocs \ rh-nodejs10-nodejs \ rh-nodejs10-npm \