From 14304edabe3285b4dde739b582321fd36ddb10ec Mon Sep 17 00:00:00 2001
From: Jordan Pryde <jordan@pryde.me>
Date: Fri, 12 Jul 2024 13:39:09 -0700
Subject: [PATCH] Use relative symlinks to workaround ostree-ext-rs bug

See containers/bootc#679
---
 .github/workflows/build.yml             | 6 +++---
 .github/workflows/upgrade-snapshots.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 36b1a6a..ffb4847 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,11 +62,11 @@ jobs:
         run: |
           mkdir -p /etc/containers
           echo '{}' > /etc/containers/auth.json
-          ln -s /etc/containers/auth.json /etc/ostree/auth.json
+          ln -sr /etc/containers/auth.json /etc/ostree/auth.json
           mkdir -p ~/.config/containers
-          ln -s /etc/containers/auth.json ~/.config/containers/auth.json
+          ln -sr /etc/containers/auth.json ~/.config/containers/auth.json
           mkdir -p ~/.docker
-          ln -s /etc/containers/auth.json ~/.docker/config.json
+          ln -sr /etc/containers/auth.json ~/.docker/config.json
           buildah login ghcr.io --authfile /etc/containers/auth.json -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }}
       - name: Get container manifest
         id: target-manifest
diff --git a/.github/workflows/upgrade-snapshots.yml b/.github/workflows/upgrade-snapshots.yml
index 76e404c..cac33b1 100644
--- a/.github/workflows/upgrade-snapshots.yml
+++ b/.github/workflows/upgrade-snapshots.yml
@@ -25,11 +25,11 @@ jobs:
         run: |
           mkdir -p /etc/containers
           echo '{}' > /etc/containers/auth.json
-          ln -s /etc/containers/auth.json /etc/ostree/auth.json
+          ln -sr /etc/containers/auth.json /etc/ostree/auth.json
           mkdir -p ~/.config/containers
-          ln -s /etc/containers/auth.json ~/.config/containers/auth.json
+          ln -sr /etc/containers/auth.json ~/.config/containers/auth.json
           mkdir -p ~/.docker
-          ln -s /etc/containers/auth.json ~/.docker/config.json
+          ln -sr /etc/containers/auth.json ~/.docker/config.json
           buildah login ghcr.io --authfile /etc/containers/auth.json -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout repo
         uses: actions/checkout@v4