Skip to content

Commit

Permalink
Merge pull request ratify-project#1585 from ratify-project/dev
Browse files Browse the repository at this point in the history
chore: automated PR to main 2024-06-21
  • Loading branch information
susanshi authored Jun 25, 2024
2 parents 5e81022 + efe84cf commit 9bf9232
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
19 changes: 9 additions & 10 deletions .github/workflows/pr-to-main.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
name: pr_to_main

on:
push:
branches:
- 'dev'
schedule:
- cron: '30 8 * * 0' # early morning (08:30 UTC) every Sunday
workflow_dispatch:

permissions:
pull-requests: write

jobs:
main:
name: Create PR Release to Main
pull-request:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
Expand All @@ -20,13 +19,13 @@ jobs:

- name: git checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332

# https://github.com/marketplace/actions/github-pull-request-action
- name: Get current date
id: date
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
- name: create pull request with reposync action
id: open-pr
uses: repo-sync/pull-request@7e79a9f5dc3ad0ce53138f01df2fad14a04831c5 #v2.12.1
with:
github_token: ${{ secrets.PR_TOKEN }}
destination_branch: main
pr_title: ${{ github.event.commits[0].message }}
pr_body: "Automated Pull Request"
pr_title: "chore: automated PR to main ${{ steps.date.outputs.date }}"
pr_body: "Automated Pull Request to main branch"
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ e2e-helm-deploy-ratify-without-tls-certs:
--set image.tag=test \
--set gatekeeper.version=${GATEKEEPER_VERSION} \
--set featureFlags.RATIFY_CERT_ROTATION=${CERT_ROTATION_ENABLED} \
--set notaryCert="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
--set notationCerts[0]="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
--set cosign.key="$$(cat .staging/cosign/cosign.pub)" \
--set cosignKeys[0]="$$(cat .staging/cosign/cosign.pub)" \
--set cosign.tLogVerify=false \
Expand Down
2 changes: 1 addition & 1 deletion crd.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM alpine@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd as builder
FROM alpine@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 as builder

ARG TARGETOS
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion httpserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM --platform=$BUILDPLATFORM golang:1.21@sha256:2eb85b8942c29145b4a5bed2d0f3dc1a3ba2f823aec74afe16751da108a585e1 as builder
FROM --platform=$BUILDPLATFORM golang:1.21@sha256:b405b620c7b53ef64695c7da7c8396f411f381c1eb7da6713c585dd7eca1559b as builder

ARG TARGETPLATFORM
ARG TARGETOS
Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-ci-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export ACR_NAME="${ACR_NAME:-ratifyacr${SUFFIX}}"
export AKS_NAME="${AKS_NAME:-ratify-aks-${SUFFIX}}"
export KEYVAULT_NAME="${KEYVAULT_NAME:-ratify-akv-${SUFFIX}}"
export USER_ASSIGNED_IDENTITY_NAME="${USER_ASSIGNED_IDENTITY_NAME:-ratify-e2e-identity-${SUFFIX}}"
export LOCATION="eastus"
export LOCATION="westus2"
export KUBERNETES_VERSION=${1:-1.29.2}
GATEKEEPER_VERSION=${2:-3.16.0}
TENANT_ID=$3
Expand Down

0 comments on commit 9bf9232

Please sign in to comment.