From 46449e42b8123cf94ccc8c76cce86c5d6bc18314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emirhan=20Durmu=C5=9F?= Date: Wed, 25 Mar 2026 01:25:38 +0300 Subject: [PATCH 1/2] github ci branches edited --- .github/workflows/push.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 6de2f8c..7a25223 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -2,7 +2,8 @@ name: CI on: push: branches: - - main + - master + - develop tags: [v*] paths-ignore: - README.md @@ -10,7 +11,8 @@ on: - LICENSE pull_request: branches: - - main + - master + - develop paths-ignore: - README.md - CHANGELOG.md From 4dcf964f708d3a99d654e7a065f80daf8d0c9d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emirhan=20Durmu=C5=9F?= Date: Wed, 25 Mar 2026 01:39:05 +0300 Subject: [PATCH 2/2] workflow secrets edited --- .github/workflows/push.yaml | 4 +- azure-pipelines.yaml | 314 ++++++++++++++++++------------------ 2 files changed, 159 insertions(+), 159 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 7a25223..e6e6e5f 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -64,7 +64,7 @@ jobs: with: registry: "ghcr.io" username: ${{ github.actor }} - password: ${{ secrets.PAT }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push amd64 image uses: docker/build-push-action@v5 with: @@ -91,7 +91,7 @@ jobs: with: registry: "ghcr.io" username: ${{ github.actor }} - password: ${{ secrets.PAT }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push arm64 image uses: docker/build-push-action@v5 with: diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 31080a5..3557fc2 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -1,162 +1,162 @@ -trigger: - tags: - include: - - v* - branches: - include: - - develop - paths: - exclude: - - README.md - - LICENSE -pr: none - -variables: - imageName: 'focal-freedom-236620/router' - imageTag: 'dev' - ref: $(Build.SourceBranch) - buildTag: $(Build.BuildId) - isRelease: $[startsWith(variables['Build.SourceBranch'], 'refs/tags/')] - -stages: -- stage: Build - jobs: - - job: RouterDockerImages - - timeoutInMinutes: 240 +# trigger: +# tags: +# include: +# - v* +# branches: +# include: +# - develop +# paths: +# exclude: +# - README.md +# - LICENSE +# pr: none + +# variables: +# imageName: 'focal-freedom-236620/router' +# imageTag: 'dev' +# ref: $(Build.SourceBranch) +# buildTag: $(Build.BuildId) +# isRelease: $[startsWith(variables['Build.SourceBranch'], 'refs/tags/')] + +# stages: +# - stage: Build +# jobs: +# - job: RouterDockerImages + +# timeoutInMinutes: 240 - strategy: - matrix: - amd64: - poolImageName: 'Azure Pipelines' - imageTagSuffix: 'amd64' - arm32v7: - poolImageName: 'RPi' - imageTagSuffix: 'arm32v7' - arm64v8: - poolImageName: 'build-farm-coral' - imageTagSuffix: 'arm64v8' - - pool: $(poolImageName) - - steps: - - script: | - if [[ $(ref) == refs/tags* ]]; then - TAG=$(echo $(ref) | sed "s|refs/tags/v||g") - echo "##vso[task.setvariable variable=imageTag]$TAG" - else - LATESTTAG=$(git tag | tail -1) - LATESTVERS=${LATESTTAG#?} - if [ -z "$LATESTVERS" ]; then LATESTVERS=0.0.0; fi - echo "##vso[task.setvariable variable=imageTag]$LATESTVERS-b$(buildTag)" - fi - displayName: 'Set image tag' - - - template: ./pipeline.yaml - parameters: - imageName: $(imageName) - imageTag: $(imageTag)-$(imageTagSuffix) - dockerFile: 'Dockerfile' - -- stage: Publish - jobs: - - job: Dev_ioFogRouterDockerManifest - - timeoutInMinutes: 240 +# strategy: +# matrix: +# amd64: +# poolImageName: 'Azure Pipelines' +# imageTagSuffix: 'amd64' +# arm32v7: +# poolImageName: 'RPi' +# imageTagSuffix: 'arm32v7' +# arm64v8: +# poolImageName: 'build-farm-coral' +# imageTagSuffix: 'arm64v8' + +# pool: $(poolImageName) + +# steps: +# - script: | +# if [[ $(ref) == refs/tags* ]]; then +# TAG=$(echo $(ref) | sed "s|refs/tags/v||g") +# echo "##vso[task.setvariable variable=imageTag]$TAG" +# else +# LATESTTAG=$(git tag | tail -1) +# LATESTVERS=${LATESTTAG#?} +# if [ -z "$LATESTVERS" ]; then LATESTVERS=0.0.0; fi +# echo "##vso[task.setvariable variable=imageTag]$LATESTVERS-b$(buildTag)" +# fi +# displayName: 'Set image tag' + +# - template: ./pipeline.yaml +# parameters: +# imageName: $(imageName) +# imageTag: $(imageTag)-$(imageTagSuffix) +# dockerFile: 'Dockerfile' + +# - stage: Publish +# jobs: +# - job: Dev_ioFogRouterDockerManifest + +# timeoutInMinutes: 240 - pool: 'Azure Pipelines' - - variables: - DOCKER_CLI_EXPERIMENTAL: enabled - - steps: - - script: | - if [[ $(ref) == refs/tags* ]]; then - TAG=$(echo $(ref) | sed "s|refs/tags/v||g") - echo "##vso[task.setvariable variable=imageTag]$TAG" - else - LATESTTAG=$(git tag | tail -1) - LATESTVERS=${LATESTTAG#?} - if [ -z "$LATESTVERS" ]; then LATESTVERS=0.0.0; fi - echo "##vso[task.setvariable variable=imageTag]$LATESTVERS-b$(buildTag)" - fi - displayName: 'Set image tag' - - - script: | - echo $(imageTag) - displayName: 'Check image tag' +# pool: 'Azure Pipelines' + +# variables: +# DOCKER_CLI_EXPERIMENTAL: enabled + +# steps: +# - script: | +# if [[ $(ref) == refs/tags* ]]; then +# TAG=$(echo $(ref) | sed "s|refs/tags/v||g") +# echo "##vso[task.setvariable variable=imageTag]$TAG" +# else +# LATESTTAG=$(git tag | tail -1) +# LATESTVERS=${LATESTTAG#?} +# if [ -z "$LATESTVERS" ]; then LATESTVERS=0.0.0; fi +# echo "##vso[task.setvariable variable=imageTag]$LATESTVERS-b$(buildTag)" +# fi +# displayName: 'Set image tag' + +# - script: | +# echo $(imageTag) +# displayName: 'Check image tag' - - task: Docker@2 - displayName: Login to Dockerhub - inputs: - command: login - containerRegistry: 'Edgeworx GCP' - - - script: | - docker pull gcr.io/$(imageName):$(imageTag)-amd64 - docker pull gcr.io/$(imageName):$(imageTag)-arm32v7 - docker pull gcr.io/$(imageName):$(imageTag)-arm64v8 - displayName: 'Pull amd64, arm32v7, and arm64v8 docker images' - - - script: | - docker manifest create \ - gcr.io/$(imageName):$(imageTag) \ - --amend gcr.io/$(imageName):$(imageTag)-amd64 \ - --amend gcr.io/$(imageName):$(imageTag)-arm32v7 \ - --amend gcr.io/$(imageName):$(imageTag)-arm64v8 - displayName: 'Create image manifest' - - - script: | - docker manifest push gcr.io/$(imageName):$(imageTag) - displayName: 'Push image manifest' - - - job: Prod_ioFogRouterDockerManifest - condition: eq(variables['isRelease'], true) - - timeoutInMinutes: 240 +# - task: Docker@2 +# displayName: Login to Dockerhub +# inputs: +# command: login +# containerRegistry: 'Edgeworx GCP' + +# - script: | +# docker pull gcr.io/$(imageName):$(imageTag)-amd64 +# docker pull gcr.io/$(imageName):$(imageTag)-arm32v7 +# docker pull gcr.io/$(imageName):$(imageTag)-arm64v8 +# displayName: 'Pull amd64, arm32v7, and arm64v8 docker images' + +# - script: | +# docker manifest create \ +# gcr.io/$(imageName):$(imageTag) \ +# --amend gcr.io/$(imageName):$(imageTag)-amd64 \ +# --amend gcr.io/$(imageName):$(imageTag)-arm32v7 \ +# --amend gcr.io/$(imageName):$(imageTag)-arm64v8 +# displayName: 'Create image manifest' + +# - script: | +# docker manifest push gcr.io/$(imageName):$(imageTag) +# displayName: 'Push image manifest' + +# - job: Prod_ioFogRouterDockerManifest +# condition: eq(variables['isRelease'], true) + +# timeoutInMinutes: 240 - pool: 'Azure Pipelines' - - variables: - DOCKER_CLI_EXPERIMENTAL: enabled - - steps: - - script: | - if [[ $(ref) == refs/tags* ]]; then - TAG=$(echo $(ref) | sed "s|refs/tags/v||g") - echo "##vso[task.setvariable variable=imageTag]$TAG" - else - LATESTTAG=$(git tag | tail -1) - LATESTVERS=${LATESTTAG#?} - if [ -z "$LATESTVERS" ]; then LATESTVERS=0.0.0; fi - echo "##vso[task.setvariable variable=imageTag]$LATESTVERS-b$(buildTag)" - fi - displayName: 'Set image tag' - - - script: | - echo $(imageTag) - displayName: 'Check image tag' +# pool: 'Azure Pipelines' + +# variables: +# DOCKER_CLI_EXPERIMENTAL: enabled + +# steps: +# - script: | +# if [[ $(ref) == refs/tags* ]]; then +# TAG=$(echo $(ref) | sed "s|refs/tags/v||g") +# echo "##vso[task.setvariable variable=imageTag]$TAG" +# else +# LATESTTAG=$(git tag | tail -1) +# LATESTVERS=${LATESTTAG#?} +# if [ -z "$LATESTVERS" ]; then LATESTVERS=0.0.0; fi +# echo "##vso[task.setvariable variable=imageTag]$LATESTVERS-b$(buildTag)" +# fi +# displayName: 'Set image tag' + +# - script: | +# echo $(imageTag) +# displayName: 'Check image tag' - - task: Docker@2 - displayName: Login to Dockerhub - inputs: - command: login - containerRegistry: 'Edgeworx GCP' - - - script: | - docker pull gcr.io/$(imageName):$(imageTag)-amd64 - docker pull gcr.io/$(imageName):$(imageTag)-arm32v7 - docker pull gcr.io/$(imageName):$(imageTag)-arm64v8 - displayName: 'Pull amd64, arm32v7, and arm64v8 docker images' - - - script: | - docker manifest create \ - gcr.io/$(imageName):$(imageTag) \ - --amend gcr.io/$(imageName):$(imageTag)-amd64 \ - --amend gcr.io/$(imageName):$(imageTag)-arm32v7 \ - --amend gcr.io/$(imageName):$(imageTag)-arm64v8 - displayName: 'Create image manifest' - - - script: | - docker manifest push gcr.io/$(imageName):$(imageTag) - displayName: 'Push image manifest' +# - task: Docker@2 +# displayName: Login to Dockerhub +# inputs: +# command: login +# containerRegistry: 'Edgeworx GCP' + +# - script: | +# docker pull gcr.io/$(imageName):$(imageTag)-amd64 +# docker pull gcr.io/$(imageName):$(imageTag)-arm32v7 +# docker pull gcr.io/$(imageName):$(imageTag)-arm64v8 +# displayName: 'Pull amd64, arm32v7, and arm64v8 docker images' + +# - script: | +# docker manifest create \ +# gcr.io/$(imageName):$(imageTag) \ +# --amend gcr.io/$(imageName):$(imageTag)-amd64 \ +# --amend gcr.io/$(imageName):$(imageTag)-arm32v7 \ +# --amend gcr.io/$(imageName):$(imageTag)-arm64v8 +# displayName: 'Create image manifest' + +# - script: | +# docker manifest push gcr.io/$(imageName):$(imageTag) +# displayName: 'Push image manifest'