diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..8c139c7 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: +- package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..6c1373f --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,28 @@ +name: Test Workflow +'on': + push: + branches: + - master + pull_request: + branches: + - master +jobs: + Build: + runs-on: '${{ matrix.os }}' + strategy: + matrix: + include: + - os: ubuntu-22.04 + TESTENV: openldap + - os: ubuntu-22.04 + TESTENV: apacheds + fail-fast: false + steps: + - uses: actions/checkout@v3 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.1 + bundler-cache: true + - run: 'if [ "${{ matrix.TESTENV }}" = "openldap" ]; then ./script/install-openldap; fi' + - run: bundle install + - run: ./script/cibuild-${{ matrix.TESTENV }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d9fd02b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -language: ruby -rvm: - - 2.0.0 - - 2.1.0 - -env: - - TESTENV=openldap - - TESTENV=apacheds - -# https://docs.travis-ci.com/user/hosts/ -addons: - hosts: - - ad1.ghe.dev - - ad2.ghe.dev - -before_install: - - echo "deb http://ftp.br.debian.org/debian stable main" | sudo tee -a /etc/apt/sources.list - - sudo apt-get update - -install: - - if [ "$TESTENV" = "openldap" ]; then ./script/install-openldap; fi - - bundle install - -script: - - ./script/cibuild-$TESTENV - -matrix: - fast_finish: true -notifications: - email: false diff --git a/script/install-openldap b/script/install-openldap index 2deddad..b094c28 100755 --- a/script/install-openldap +++ b/script/install-openldap @@ -37,6 +37,6 @@ sudo /etc/init.d/slapd start # /vagrant/services/ldap/openldap/seed.rb | sudo slapadd -F /etc/ldap/slapd.d cat $SEED_PATH/seed.ldif | /usr/bin/time sudo ldapadd -x -D "cn=admin,dc=github,dc=com" -w passworD1 \ - -h localhost -p 389 + -H ldap://localhost:389 sudo rm -rf $TMPDIR diff --git a/test/fixtures/openldap/memberof.ldif b/test/fixtures/openldap/memberof.ldif index dac7c6b..8f461fe 100644 --- a/test/fixtures/openldap/memberof.ldif +++ b/test/fixtures/openldap/memberof.ldif @@ -5,7 +5,7 @@ objectClass: top olcModulePath: /usr/lib/ldap olcModuleLoad: memberof.la -dn: olcOverlay={0}memberof,olcDatabase={1}hdb,cn=config +dn: olcOverlay={0}memberof,olcDatabase={1}mdb,cn=config objectClass: olcConfig objectClass: olcMemberOf objectClass: olcOverlayConfig @@ -24,7 +24,7 @@ objectclass: top olcmoduleload: refint.la olcmodulepath: /usr/lib/ldap -dn: olcOverlay={1}refint,olcDatabase={1}hdb,cn=config +dn: olcOverlay={1}refint,olcDatabase={1}mdb,cn=config objectClass: olcConfig objectClass: olcOverlayConfig objectClass: olcRefintConfig diff --git a/test/fixtures/openldap/slapd.conf.ldif b/test/fixtures/openldap/slapd.conf.ldif index 7d88769..95518f4 100644 --- a/test/fixtures/openldap/slapd.conf.ldif +++ b/test/fixtures/openldap/slapd.conf.ldif @@ -33,21 +33,17 @@ dn: cn=module{0},cn=config objectClass: olcModuleList cn: module{0} olcModulePath: /usr/lib/ldap -olcModuleLoad: back_hdb +olcModuleLoad: back_mdb -dn: olcBackend=hdb,cn=config +dn: olcBackend=mdb,cn=config objectClass: olcBackendConfig -olcBackend: hdb +olcBackend: mdb -dn: olcDatabase=hdb,cn=config +dn: olcDatabase=mdb,cn=config objectClass: olcDatabaseConfig -objectClass: olcHdbConfig -olcDatabase: hdb +objectClass: olcMdbConfig +olcDatabase: mdb olcDbCheckpoint: 512 30 -olcDbConfig: set_cachesize 1 0 0 -olcDbConfig: set_lk_max_objects 1500 -olcDbConfig: set_lk_max_locks 1500 -olcDbConfig: set_lk_max_lockers 1500 olcLastMod: TRUE olcSuffix: dc=github,dc=com olcDbDirectory: /var/lib/ldap