Merge pull request #85 from sineverba/refactor-semaphore

Refactor Semaphore

Author: sineverba

.semaphore/deploy.yml .semaphore/build-deploy.yml.semaphore/deploy.yml renamed to .semaphore/build-deploy.yml

@@ -4,11 +4,13 @@ name: Build and deploy Pipeline
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
 execution_time_limit:
   hours: 3
 
 global_job_config:
+  secrets:
+    - name: ACCESS_TOKENS
 
   prologue:
     commands:
@@ -34,6 +36,4 @@ blocks:
             - docker buildx version
             - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             - docker buildx create --name mybuilder && docker buildx use mybuilder && docker buildx inspect --bootstrap
-            - docker buildx build --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --tag $DOCKER_USERNAME/$DOCKER_IMAGE:$SEMAPHORE_GIT_TAG_NAME --tag $DOCKER_USERNAME/$DOCKER_IMAGE:latest --push .
-      secrets:
-        - name: DOCKER_TOKEN
+            - docker buildx build --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --tag $DOCKER_USERNAME/$DOCKER_IMAGE:$SEMAPHORE_GIT_TAG_NAME --tag $DOCKER_USERNAME/$DOCKER_IMAGE:latest --push .

.semaphore/semaphore.yml

@@ -1,12 +1,14 @@
 version: v1.0
 
-name: Build and test Pipeline
+name: Test
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
 
 global_job_config:
+  secrets:
+    - name: ACCESS_TOKENS
 
   prologue:
     commands:
@@ -19,12 +21,12 @@ global_job_config:
       value: php74xc
 
 blocks:
-  - name: 'Build and test'
+  - name: "Test"
     skip:
       when: "tag =~ '.*'"
     task:
       jobs:
-        - name: 'Build and test'
+        - name: "Build and test"
           commands:
             - checkout
             - docker build --tag $DOCKER_USERNAME/$DOCKER_IMAGE .
@@ -36,11 +38,9 @@ blocks:
             - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.22"
             - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "short_open_tag => Off => Off"
             - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "memory_limit => 512M => 512M"
-      secrets:
-        - name: DOCKER_TOKEN
 
 promotions:
   - name: Deploy
-    pipeline_file: deploy.yml
+    pipeline_file: build-deploy.yml
     auto_promote:
       when: "result = 'passed' and tag =~ '.*'"

CHANGELOG.md

@@ -1,4 +1,7 @@
-# 1.5.0
+# Next version
++ Refactor Semaphore
+
+## 1.5.0
 + Upgrade PHP to 7.4.22
 
 ## 1.4.0

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2020 sineverba
+Copyright (c) 2020 - 2022 sineverba
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,19 +1,22 @@
+IMAGE_NAME=sineverba/testphp74xc
+CONTAINER_NAME=testphp74xc
+
 build:
-		docker build --tag sineverba/testphp74xc .
+		docker build --tag $(IMAGE_NAME) .
 
 multiple:
-		docker buildx build --tag sineverba/testphp74xc --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --push .
+		docker buildx build --tag $(IMAGE_NAME) --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --push .
 
 test:
-		@docker run --rm sineverba/testphp74xc php -v | grep 7.4.22
-		@docker run --rm sineverba/testphp74xc php -v | grep OPcache
-		@docker run --rm sineverba/testphp74xc php -m | grep xdebug
-		@docker run --rm sineverba/testphp74xc php -r "xdebug_info();" | grep "3.0.4"
-		@docker run --rm sineverba/testphp74xc php -m | grep pdo_pgsql
-		@docker run --rm sineverba/testphp74xc php -m | grep zip
-		@docker run --rm sineverba/testphp74xc /usr/bin/composer -V | grep "1.10.22"
-		@docker run --rm sineverba/testphp74xc php -i | grep "short_open_tag => Off => Off"
-		@docker run --rm sineverba/testphp74xc php -i | grep "memory_limit => 512M => 512M"
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -v | grep 7.4.22
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -v | grep OPcache
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep xdebug
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -r "xdebug_info();" | grep "3.0.4"
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep pdo_pgsql
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep zip
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) /usr/bin/composer -V | grep "1.10.22"
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -i | grep "short_open_tag => Off => Off"
+		@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -i | grep "memory_limit => 512M => 512M"
 
 destroy:
-		docker image rm sineverba/testphp74xc
+		docker image rm $(IMAGE_NAME)