From 2321b89fec1854eed110cb9d1a57be350fe85a5e Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 11:34:15 -0700 Subject: [PATCH 01/15] Convert CI to Actions --- .github/workflows/main.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..43913ec --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,30 @@ +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 + steps: + - uses: actions/checkout@v3 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.1' # Not needed with a .ruby-version file + bundler-cache: true + - run: 'if [ "$TESTENV" = "openldap" ]; then ./script/install-openldap; fi' + env: &ref_0 + TESTENV: '${{ matrix.TESTENV }}' + - run: bundle install + - run: ./script/cibuild-$TESTENV + env: *ref_0 From d5de22412fa2d7e903290d9c35c2f723c995895c Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 11:45:37 -0700 Subject: [PATCH 02/15] Syntax fix --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 43913ec..d17d4b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,8 +23,6 @@ jobs: ruby-version: '3.1' # Not needed with a .ruby-version file bundler-cache: true - run: 'if [ "$TESTENV" = "openldap" ]; then ./script/install-openldap; fi' - env: &ref_0 - TESTENV: '${{ matrix.TESTENV }}' - run: bundle install - run: ./script/cibuild-$TESTENV - env: *ref_0 + From cdff52e1d3423ebb1f234e5c8d09cd5cb9d90c76 Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 11:53:19 -0700 Subject: [PATCH 03/15] Install older bundler version --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d17d4b2..c82c8a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,6 +22,7 @@ jobs: with: ruby-version: '3.1' # Not needed with a .ruby-version file bundler-cache: true + - run: gem install bundler:1.17.3 - run: 'if [ "$TESTENV" = "openldap" ]; then ./script/install-openldap; fi' - run: bundle install - run: ./script/cibuild-$TESTENV From 361e13a78bea16951219c4943cc7857a7f9d57e1 Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 11:58:59 -0700 Subject: [PATCH 04/15] 2.1 and 3.1 matrix --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c82c8a3..4d35c74 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,6 +11,7 @@ jobs: runs-on: '${{ matrix.os }}' strategy: matrix: + ruby: ['2.1', '3.1'] include: - os: ubuntu-22.04 TESTENV: openldap @@ -20,9 +21,8 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.1' # Not needed with a .ruby-version file + ruby-version: ${{ matrix.ruby }} bundler-cache: true - - run: gem install bundler:1.17.3 - run: 'if [ "$TESTENV" = "openldap" ]; then ./script/install-openldap; fi' - run: bundle install - run: ./script/cibuild-$TESTENV From d0a408ec93eff49a6bacf4b690726095a027f52f Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 12:01:46 -0700 Subject: [PATCH 05/15] Env variable access --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d35c74..b9a0f41 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: with: ruby-version: ${{ matrix.ruby }} bundler-cache: true - - run: 'if [ "$TESTENV" = "openldap" ]; then ./script/install-openldap; fi' + - run: 'if [ "${{ env.TESTENV }}" = "openldap" ]; then ./script/install-openldap; fi' - run: bundle install - - run: ./script/cibuild-$TESTENV + - run: ./script/cibuild-${{ env.TESTENV }} From cb557f347e537a9e567676b53d91bb5fe9535498 Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 12:05:23 -0700 Subject: [PATCH 06/15] Dont fast fail --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b9a0f41..16ecf93 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,6 +17,7 @@ jobs: TESTENV: openldap - os: ubuntu-22.04 TESTENV: apacheds + fail-fast: false steps: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 From 99f69ad25386003460cf2eef9506e605a04e4e57 Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 12:09:39 -0700 Subject: [PATCH 07/15] Use the matrix not the env --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 16ecf93..c69778a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,6 @@ jobs: with: ruby-version: ${{ matrix.ruby }} bundler-cache: true - - run: 'if [ "${{ env.TESTENV }}" = "openldap" ]; then ./script/install-openldap; fi' + - run: 'if [ "${{ matrix.TESTENV }}" = "openldap" ]; then ./script/install-openldap; fi' - run: bundle install - - run: ./script/cibuild-${{ env.TESTENV }} - + - run: ./script/cibuild-${{ matrix.TESTENV }} From 025309fb3e1c1d232cfd5149478f755464d2c51e Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 12:12:36 -0700 Subject: [PATCH 08/15] Just use one Ruby version --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c69778a..6c1373f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,6 @@ jobs: runs-on: '${{ matrix.os }}' strategy: matrix: - ruby: ['2.1', '3.1'] include: - os: ubuntu-22.04 TESTENV: openldap @@ -22,7 +21,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: ${{ matrix.ruby }} + ruby-version: 2.1 bundler-cache: true - run: 'if [ "${{ matrix.TESTENV }}" = "openldap" ]; then ./script/install-openldap; fi' - run: bundle install From 95863e532c2d0fe7ed4be6aebe3090e6ae82ace7 Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 12:40:14 -0700 Subject: [PATCH 09/15] Update for LDAP 2.5 --- test/fixtures/openldap/slapd.conf.ldif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/openldap/slapd.conf.ldif b/test/fixtures/openldap/slapd.conf.ldif index 7d88769..0480e39 100644 --- a/test/fixtures/openldap/slapd.conf.ldif +++ b/test/fixtures/openldap/slapd.conf.ldif @@ -33,7 +33,7 @@ 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 objectClass: olcBackendConfig From a6e2d8fb518aa5eea723146d50cc0c34e2c971be Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 12:42:56 -0700 Subject: [PATCH 10/15] Migrate to mdb --- test/fixtures/openldap/slapd.conf.ldif | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/fixtures/openldap/slapd.conf.ldif b/test/fixtures/openldap/slapd.conf.ldif index 0480e39..06e5869 100644 --- a/test/fixtures/openldap/slapd.conf.ldif +++ b/test/fixtures/openldap/slapd.conf.ldif @@ -35,14 +35,14 @@ cn: module{0} olcModulePath: /usr/lib/ldap 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 From e3ae978a9f064a4345c77c3d55ff921d02280dca Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 12:44:50 -0700 Subject: [PATCH 11/15] remove undefined attributes --- test/fixtures/openldap/slapd.conf.ldif | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/fixtures/openldap/slapd.conf.ldif b/test/fixtures/openldap/slapd.conf.ldif index 06e5869..95518f4 100644 --- a/test/fixtures/openldap/slapd.conf.ldif +++ b/test/fixtures/openldap/slapd.conf.ldif @@ -44,10 +44,6 @@ objectClass: olcDatabaseConfig 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 From f2f0e5575b6210d612ac376cad69bc4bd57e3552 Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 12:48:01 -0700 Subject: [PATCH 12/15] hdb -> mdb --- test/fixtures/openldap/memberof.ldif | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From ade7c5de63c3746c8da256dc8082585fc38c8022 Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 12:54:19 -0700 Subject: [PATCH 13/15] use URI --- script/install-openldap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 66bf93875132ea8bb4ab8908b14df89e4b194a29 Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 13:19:52 -0700 Subject: [PATCH 14/15] Delete .travis.yml --- .travis.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 .travis.yml 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 From 4c2dabdd732213009c08e42ae497bf739bd60c4a Mon Sep 17 00:00:00 2001 From: djdefi Date: Mon, 15 Aug 2022 13:49:45 -0700 Subject: [PATCH 15/15] Add Dependabot config for Actions --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml 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"