Skip to content

Commit e447b19

Browse files
committed
Test.
1 parent d082caa commit e447b19

File tree

3 files changed

+15
-43
lines changed

3 files changed

+15
-43
lines changed

.gitlab-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ drupal-build:
156156
extends: .drupal-build-template
157157
variables:
158158
EXECUTOR: "wunderio/silta-cicd:circleci-php8.3-node22-composer2-v1"
159-
DRUPAL_ROOT: "." # Customize if needed
160-
# ... other project-specific variables ...
159+
DOCKER_VERSION: "v2"
160+
SILTA_CLI_VERSION: "latest"
161161
script:
162162
- echo "Project-specific build steps here..."
163163

.gitlab/templates/drupal-build.yml

+11-27
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11

22
.decrypt-files: &decrypt-files
3-
before_script:
4-
- echo "Decrypting files..."
5-
script: []
3+
- echo "Decrypting files: $DECRYPT_FILES..."
64

75
.docker-setup: &docker-setup
8-
before_script:
9-
- echo "Setting up Docker..."
10-
script: []
6+
- echo "Setting up Docker version: $DOCKER_VERSION..."
117

128
.silta-setup: &silta-setup
13-
script:
14-
- echo "Setting up Silta..."
9+
- echo "Setting up Silta..."
1510

1611
.drupal-docker-build: &drupal-docker-build
1712
script:
@@ -28,22 +23,11 @@ include:
2823
image: $EXECUTOR
2924
stage: build
3025
variables:
31-
EXECUTOR: "silta/cicd:latest" # Replace with your actual executor image
32-
RESOURCE_CLASS: "medium" # Or use resource_group if available
33-
DRUPAL_ROOT: "."
34-
SILTA_CLI_VERSION: "latest"
35-
DECRYPT_FILES: ""
36-
SKIP_DEPLOYMENT: "false"
37-
RELEASE_SUFFIX: ""
38-
NGINX_BUILD_CONTEXT: "web"
39-
IMAGE_BUILD_BACKGROUND: "true"
40-
IMAGE_BUILD_WAIT: "true"
41-
CUSTOM_PROXY_COMMAND: ""
42-
extends:
43-
- .silta-cli-setup
44-
- .decrypt-files
45-
- .docker-setup
46-
- .silta-setup
47-
- .drupal-docker-build
48-
- .store-image-urls
49-
26+
EXECUTOR: "silta/cicd:latest"
27+
DECRYPT_FILES: "n/a"
28+
DOCKER_VERSION: "v1"
29+
before_script:
30+
- !reference [.silta-cli-setup, before_script]
31+
- *decrypt-files
32+
- *docker-setup
33+
- *silta-setup
+2-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
.silta-cli-setup: &silta-cli-setup
1+
.silta-cli-setup:
22
before_script:
3-
- |
4-
if [[ "$SILTA_CLI_VERSION" == "latest" ]]; then
5-
# Handle latest version installation (e.g., using a package manager)
6-
echo "Installing latest silta-cli..."
7-
# Example using curl (adapt as needed):
8-
curl -sL "$(curl -s https://api.github.com/repos/wunderio/silta-cli/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep linux-amd64.tar.gz)" | tar -xz -C /usr/local/bin
9-
elif [[ "$SILTA_CLI_VERSION" == "test" ]]; then
10-
echo "Installing test version of silta-cli..."
11-
# Install specific test version (replace with your actual logic)
12-
# Example:
13-
curl -sL "YOUR_TEST_SILTA_CLI_URL" | tar -xz -C /usr/local/bin
14-
fi
15-
silta version # Verify installation
3+
- echo "installing silta cli version: $SILTA_CLI_VERSION"

0 commit comments

Comments
 (0)