Skip to content

Commit b2fd18f

Browse files
committed
version bump
1 parent e7648a7 commit b2fd18f

File tree

6 files changed

+43
-9
lines changed

6 files changed

+43
-9
lines changed

.github/workflows/auto-merge-dependabot-updates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Auto Merge Dependabot Updates
16-
uses: buluma/[email protected].4
16+
uses: buluma/[email protected].5
1717
with:
1818
allowed-actors: buluma, dependabot-preview[bot], dependabot[bot]

.github/workflows/molecule.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
workflow_dispatch:
1313
push: {branches: ["master", "main", "testing"]}
1414

15-
# TODO: add to tracker
1615
concurrency:
1716
group: ${{ github.ref }}-${{ github.workflow }}
1817
cancel-in-progress: true

.github/workflows/release_drafter.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ jobs:
3939

4040
steps:
4141
- name: Checkout dj-wasabi-release repo
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v3
4343
with:
4444
repository: dj-wasabi/dj-wasabi-release
4545
path: dj-wasabi-release
4646

4747
- name: Checkout current repo
48-
uses: actions/checkout@v2
48+
uses: actions/checkout@v3
4949
with:
50-
path: master
50+
path: main
5151

5252
- name: Commit Changelog file
5353
run: |
5454
# We are cloned in the 'main' directory and the dj-wasabi-release
5555
# repository is the 'dj-wasabi-release' next to 'main'
56-
cd master
56+
cd main
5757
# Generate CHANGELOG.md file
5858
../dj-wasabi-release/release.sh -d
5959
# Let commit the changes if there are any? (Well there should be!)

.gitlab-ci.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ variables:
99
PY_COLORS: 1
1010

1111
molecule:
12+
stage: build
13+
allow_failure: true
1214
script:
1315
- image=${image} tag=${tag} molecule test
1416
retry: 1
@@ -38,6 +40,8 @@ molecule:
3840
tag: "focal"
3941

4042
testing:
43+
stage: test
44+
needs: []
4145
script:
4246
- image=${image} tag=${tag} molecule test
4347
rules:
@@ -69,10 +73,14 @@ testing:
6973
tag: "focal"
7074

7175
galaxy:
76+
stage: deploy
77+
needs: []
7278
script:
7379
- ansible-galaxy role info buluma.terraform
7480

7581
role_testing:
82+
stage: test
83+
needs: []
7684
script:
7785
- image=${image} tag=${tag} ansible-galaxy install buluma.terraform
7886
retry: 1
@@ -100,3 +108,21 @@ role_testing:
100108
tag: "bionic"
101109
- image: "docker-ubuntu-systemd"
102110
tag: "focal"
111+
112+
release_job:
113+
stage: .post
114+
needs: [molecule]
115+
image: registry.gitlab.com/gitlab-org/release-cli:latest
116+
rules:
117+
- if: $CI_COMMIT_TAG
118+
script:
119+
- echo "Running the release job."
120+
release:
121+
tag_name: $CI_COMMIT_TAG
122+
name: 'Release $CI_COMMIT_TAG'
123+
description: 'Release created using the release-cli.'
124+
artifacts:
125+
name: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME"
126+
paths:
127+
- /
128+
expire_in: 1 day

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Apache License
3-
Version 2.0, 04 2022
3+
Version 2.0, 05 2022
44
http://www.apache.org/licenses/
55

66
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

molecule/default/molecule.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,23 @@ lint: |
1414
driver:
1515
name: docker
1616
platforms:
17-
- name: "terraform-${image:-docker-ubuntu2104-ansible}-${tag:-latest}${TOX_ENVNAME}"
18-
image: "${namespace:-buluma}/${image:-docker-ubuntu2104-ansible}:${tag:-latest}"
17+
- name: "terraform-${image:-docker-centos7-ansible}-${tag:-latest}${TOX_ENVNAME}"
18+
image: "${namespace:-buluma}/${image:-docker-centos7-ansible}:${tag:-latest}"
1919
command: /sbin/init
2020
volumes:
2121
- /sys/fs/cgroup:/sys/fs/cgroup:ro
2222
privileged: yes
2323
pre_build_image: yes
24+
tty: true
25+
environment:
26+
container: docker
2427
provisioner:
2528
name: ansible
29+
config_options:
30+
defaults:
31+
interpreter_python: auto_legacy_silent
32+
callback_whitelist: profile_tasks
33+
ssh_connection:
34+
pipelining: true
2635
verifier:
2736
name: ansible

0 commit comments

Comments
 (0)