Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
charphi committed May 3, 2021
2 parents 665b110 + 4e19dc4 commit a66d1eb
Show file tree
Hide file tree
Showing 359 changed files with 10,063 additions and 4,368 deletions.
25 changes: 0 additions & 25 deletions .dependabot/config.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
67 changes: 67 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ develop ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ develop ]
schedule:
- cron: '39 3 * * 1'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
language: [ 'java' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
133 changes: 133 additions & 0 deletions .github/workflows/java8-maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
name: Java8+ with Maven

on: [ push, pull_request ]

jobs:
build-and-test-job:
strategy:
fail-fast: false
matrix:
java: [ 8, 11 ]
os: [ ubuntu-latest, macOS-latest, windows-latest ]
experimental: [ false ]
include:
- java: '>11'
os: ubuntu-latest
experimental: true

name: JDK${{ matrix.java }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}

steps:
- name: Checkout source code
uses: actions/checkout@v2
with:
submodules: true

- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}

- name: Setup Maven cache
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Build and (headless) test with Maven
uses: GabrielBB/xvfb-action@v1
with:
run: mvn -B -ntp package

snapshot-job:
needs: build-and-test-job
if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/heads/develop')
strategy:
matrix:
java: [ 11 ]
os: [ ubuntu-latest ]

name: Snapshot on develop
runs-on: ${{ matrix.os }}

steps:
- name: Checkout source code
uses: actions/checkout@v2
with:
submodules: true

- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}

- name: Setup Maven cache
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Deploy snapshot with Maven if settings defined
run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

release-job:
needs: build-and-test-job
if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/tags/v')
strategy:
matrix:
java: [ 11 ]
os: [ ubuntu-latest ]

name: Release on tag
runs-on: ${{ matrix.os }}

steps:
- name: Checkout source code
uses: actions/checkout@v2
with:
submodules: true

- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}

- name: Setup Maven cache
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Deploy with Maven if settings defined
run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

- name: Build assets with Maven
run: mvn -B -ntp install -DskipTests=true -P base-deploy
env:
SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

- name: Create dummy file if no assets
run: test -d "binaries" || (mkdir binaries && echo "no assets" > binaries/no_assets.txt)

- name: Create draft release and upload assets
uses: xresloader/upload-to-github-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
file: 'binaries/*'
13 changes: 2 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,2 @@
/sdmx-dl-api/target/
/sdmx-dl-connectors/target/
/sdmx-dl-util/target/
/sdmx-dl-tck/target/
/sdmx-dl-ri/target/
/sdmx-dl-xml/target/
/sdmx-dl-kryo/target/
/sdmx-dl-sys/target/
/sdmx-dl-testing/target/
/sdmx-dl-cli/target/
/target/
target/
/binaries/
9 changes: 0 additions & 9 deletions .travis.settings.xml

This file was deleted.

96 changes: 0 additions & 96 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit a66d1eb

Please sign in to comment.